whycrzg
2021-05-21 06fc824fdbd64b7221656a7b591b39fd5ccacc1f
src/main/java/com/whyc/service/WindingExperimentService.java
@@ -61,12 +61,19 @@
    }
    /**
     * 绕组实验步骤1
     * 绕组实验步骤 step参数 1 2 对应实验步骤1、2
     * @param list
     * @return
     */
    public Response<Object> addExperimentWindingStep1(List<ExperimentWindingStep1> list) {
        Boolean flag = true;
        if (list != null) {
            for (int i = 0; i < list.size(); i++) {
                ExperimentWindingStep1 experimentWindingStep1 = list.get(i);
                experimentWindingStep1.setSaveTime(new Date());
                list.set(i, experimentWindingStep1);
            }
        }
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        try {
            for (int i = 0; i < list.size(); i++) {
@@ -99,6 +106,13 @@
     */
    public Response<Object> addExperimentWindingStep2(List<ExperimentWindingStep2> list) {
        Boolean flag = true;
        if (list != null) {
            for (int i = 0; i < list.size(); i++) {
                ExperimentWindingStep2 experimentWindingStep2 = list.get(i);
                experimentWindingStep2.setSaveTime(new Date());
                list.set(i, experimentWindingStep2);
            }
        }
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        try {
            for (int i = 0; i < list.size(); i++) {
@@ -153,6 +167,7 @@
    /**
     * 根据 experimentId 编辑参数
     * step参数 1 2 对应实验步骤1、2
     * @param windingStep1s
     * @return
     */
@@ -279,17 +294,19 @@
    }
    /**
     * 实验数据1
     * 实验数据 step参数 1 2 对应实验步骤1、2
     *
     * @param step
     * @param pageNum
     * @param pageSize
     * @return
     */
    public Response getExperimentWindingStep1(int pageNum, int pageSize) {
    public Response getExperimentWindingStep1(int step, int pageNum, int pageSize) {
        PageHelper.startPage(pageNum, pageSize);
        List<ExperimentWindingStep1> list = mapper1.selectList(null);
//        mapper.getRealNameById();
//        mapper.getdeviceIdById();
        QueryWrapper<ExperimentWindingStep1> wrapper = new QueryWrapper<>();
        wrapper.eq("step",step);
        List<ExperimentWindingStep1> list = mapper1.selectList(wrapper);
        PageInfo<ExperimentWindingStep1> pageInfo = new PageInfo<>(list);
        return new Response<PageInfo<ExperimentWindingStep1>>().set(1, pageInfo);
    }
@@ -328,4 +345,31 @@
        }
        return response;
    }
    /**
     * 状态:-1-取消,0-未开始,1-进行中,2-完成
     *      * 不对controller接口提供取消功能
     * @param id
     * @return
     */
    public Response updateFlag(String id) {
        Response<Object> response = new Response<>();
        QueryWrapper<Experiment> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("id",id);
        Experiment experiment1 = mapper.selectOne(queryWrapper);
        if (experiment1 ==null){
            response.setMsg(0,"试验编号有误");
        }
        try {
            Experiment experiment = new Experiment<>();
            experiment.setId(id);
            experiment.setEndTime(new Date());
            mapper.updateFlag(experiment);
        } catch (Exception e) {
            e.printStackTrace();
            response.setMsg(0,"更新失败");
        }
        return response.setMsg(1,"更新成功");
    }
}