whycrzg
2021-05-24 5a10ca9553cd9a5d793725341b49737a22bcd445
绕组实验更新接口
4个文件已修改
70 ■■■■■ 已修改文件
src/main/java/com/whyc/controller/WindingExperimentController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/ExperimentWindingStep1Mapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/WindingExperimentService.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ExperimentWindingStep1Mapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/WindingExperimentController.java
@@ -87,7 +87,7 @@
    @PostMapping("saveRZStep")
    @ApiOperation(value = "保存数据",notes = "step参数 1 2 对应实验步骤1、2 不需要传value的参数 保存时间saveTime、状态status、设备类型deviceId、note")
    @ApiOperation(value = "保存数据",notes = "step参数 1 2 对应实验步骤1、2 不需要传value的参数  测试人realName 保存时间saveTime、状态status、设备类型deviceId、note")
    public Response addExperimentWindingStep1(@RequestBody List<ExperimentWindingStep1> windingStep1s){
        return service.addExperimentWindingStep1(windingStep1s);
src/main/java/com/whyc/mapper/ExperimentWindingStep1Mapper.java
@@ -23,4 +23,8 @@
    int updateById(ExperimentWindingStep1 windingStep1);
    int updateByIdandIndex(ExperimentWindingStep1 windingStep1);
    //根据试验ID查询到uid在tb_user表查询real_name
    String getRealName(String experimentId);
}
src/main/java/com/whyc/service/WindingExperimentService.java
@@ -69,6 +69,7 @@
        Boolean flag = true;
        if (list != null) {
            Experiment experiment = null;
            String realName;
            try {
                ExperimentWindingStep1 step1 = list.get(0);
                QueryWrapper<Experiment> wrapper = new QueryWrapper<>();
@@ -76,41 +77,47 @@
                experiment = mapper.selectOne(wrapper);
                if (experiment == null) {
                    return new Response().setMsg(0, "添加失败,试验编号不存在");
                }else {
                } else {
                    System.out.println("wrapper = " + wrapper);
                }
                realName = mapper1.getRealName(step1.getExperimentId());
                if (realName == null) {
                    return new Response().setMsg(0, "添加失败,uid未查询到对应试验人");
                }
                System.out.println("realName = " + realName);
            } catch (Exception e) {
                e.printStackTrace();
                return new Response().setMsg(0, "添加失败");
            }
            for (int i = 0; i < list.size(); i++) {
                ExperimentWindingStep1 experimentWindingStep1 = list.get(i);
                experimentWindingStep1.setSaveTime(new Date());
                experimentWindingStep1.setDeviceId(experiment.getDeviceId());//存设备类型
                list.set(i, experimentWindingStep1);
            }
        }
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        try {
            for (int i = 0; i < list.size(); i++) {
                ExperimentWindingStep1 windingStep1 = list.get(i);
                if (mapper1.insert(windingStep1) > 0) {
                    flag = true;
                } else {
                    flag = false;
            TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
            try {
                for (int i = 0; i < list.size(); i++) {
                    ExperimentWindingStep1 windingStep1 = list.get(i);
                    windingStep1.setSaveTime(new Date());
                    windingStep1.setDeviceId(experiment.getDeviceId());//存设备类型
                    windingStep1.setRealName(realName);       //测试人
                    windingStep1.setStatus(1);                //状态:0-未开始,1-进行中,2-已完成
                    if (mapper1.insert(windingStep1) > 0) {
                        flag = true;
                    } else {
                        flag = false;
                    }
                }
            } catch (Exception e) {
                e.printStackTrace();
                dataSourceTransactionManager.rollback(transactionStatus);       //事务回滚
                return new Response().setMsg(0, "添加失败");
            }
        } catch (Exception e) {
            e.printStackTrace();
            dataSourceTransactionManager.rollback(transactionStatus);       //事务回滚
            return new Response().setMsg(0, "添加失败");
        }
        if (flag) {
            dataSourceTransactionManager.commit(transactionStatus);
            return new Response().setMsg(1, "添加成功");
        } else {
            dataSourceTransactionManager.rollback(transactionStatus);
            if (flag) {
                dataSourceTransactionManager.commit(transactionStatus);
                return new Response().setMsg(1, "添加成功");
            } else {
                dataSourceTransactionManager.rollback(transactionStatus);
                return new Response().setMsg(0, "添加失败");
            }
        }else {
            return new Response().setMsg(0, "添加失败");
        }
src/main/resources/mapper/ExperimentWindingStep1Mapper.xml
@@ -23,6 +23,11 @@
    from tb_experiment_winding_step1
    where id = #{id,jdbcType=INTEGER}
  </select>
  <select id="getRealName" resultType="java.lang.String">
    SELECT real_name FROM `db_3.5mw_web`.`tb_user`
    WHERE id = (SELECT user_id FROM `db_3.5mw_web`.`tb_experiment` WHERE
    id = #{experimentId});
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
    delete from tb_experiment_winding_step1
    where id = #{id,jdbcType=INTEGER}