计划编制接口完善

src/main/java/org/rcisoft/business/device/maintenance/controller/MaintenanceController.java

@@ -89,39 +89,30 @@ public class MaintenanceController {
     }
 
     @ApiOperation(value = "根据日期（YYYY-mm-dd格式） 查询维修记录", notes = "根据日期（YYYY-mm-dd格式） 查询维修记录")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "date", value = "date", required = true, paramType = "query", dataType = "varchar"),
-    })
     @GetMapping(value = "/listBusDevServiceByDate")
-    public Result listBusDevServiceByDate(@RequestParam String date) {
+    public Result listBusDevServiceByDate(@RequestParam String date,@RequestParam String proId) {
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                maintenanceService.listBusDevServiceByDate(date));
+                maintenanceService.listBusDevServiceByDate(date,proId));
 
     }
 
-    @ApiOperation(value = "根据年份 查询维修记录", notes = "根据年份 查询维修记录")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "year", value = "year", required = true, paramType = "query", dataType = "varchar"),
-    })
+    @ApiOperation(value = "根据年份 查询单个项目维修记录", notes = "根据年份 查询单个项目维修记录")
     @GetMapping(value = "/listBusDevServiceByYear")
-    public Result listBusDevServiceByYear(@RequestParam String year) {
+    public Result listBusDevServiceByYear(@RequestParam String year,@RequestParam String proId) {
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                maintenanceService.listBusDevServiceByYear(year));
+                maintenanceService.listBusDevServiceByYear(year,proId));
 
     }
-    @ApiOperation(value = "根据年份 查询存在维修记录的日期", notes = "根据年份 查询存在维修记录的日期")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "year", value = "year", required = true, paramType = "query", dataType = "varchar"),
-    })
+    @ApiOperation(value = "根据年份 查询单个项目存在维修记录的日期", notes = "根据年份 查询单个项目存在维修记录的日期")
     @GetMapping(value = "/listDevDate")
-    public Result listDevDate(@RequestParam String year) {
+    public Result listDevDate(@RequestParam String year,@RequestParam String proId) {
         return Result.builder(new PersistModel(1),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                maintenanceService.listDevDate(year));
+                maintenanceService.listDevDate(year,proId));
     }
 }

src/main/java/org/rcisoft/business/device/maintenance/dao/MaintenanceRepository.java

@@ -47,8 +47,8 @@ public interface MaintenanceRepository extends BaseMapper<BusDevService> {
      * @param date the date
      * @return the list
      */
-    @Select("SELECT ds.*,d.DEV_NM,tp.DEV_TP_NM FROM bus_dev_service ds INNER JOIN bus_device d on d.DEV_ID = ds.DEV_ID INNER JOIN bus_device_tp tp ON tp.DEV_TP_ID=d.DEV_TP_ID WHERE DATE_FORMAT(SER_TM,'%Y-%m-%d') = #{date}")
-    List<Map<String,Object>> listBusDevServiceByDate(@Param("date") String date);
+    @Select("SELECT ds.*,d.DEV_NM,tp.DEV_TP_NM FROM bus_dev_service ds INNER JOIN bus_device d on d.DEV_ID = ds.DEV_ID INNER JOIN bus_device_tp tp ON tp.DEV_TP_ID=d.DEV_TP_ID WHERE DATE_FORMAT(SER_TM,'%Y-%m-%d') = #{date} and d.PRO_ID = #{proId}")
+    List<Map<String,Object>> listBusDevServiceByDate(@Param("date") String date,@Param("proId") String proId);
 
     /**
      * List bus dev service by year list.
@@ -57,8 +57,8 @@ public interface MaintenanceRepository extends BaseMapper<BusDevService> {
      * @param year the year
      * @return the list
      */
-    @Select("SELECT ds.*,d.DEV_NM,tp.DEV_TP_NM,tp.DEV_TP_ID FROM bus_dev_service ds INNER JOIN bus_device d on d.DEV_ID = ds.DEV_ID INNER JOIN bus_device_tp tp ON tp.DEV_TP_ID=d.DEV_TP_ID WHERE DATE_FORMAT(SER_TM,'%Y') = #{year}")
-    List<Map<String,Object>> listBusDevServiceByYear(@Param("year") String year);
+    @Select("SELECT ds.*,d.DEV_NM,tp.DEV_TP_NM,tp.DEV_TP_ID FROM bus_dev_service ds INNER JOIN bus_device d on d.DEV_ID = ds.DEV_ID INNER JOIN bus_device_tp tp ON tp.DEV_TP_ID=d.DEV_TP_ID WHERE DATE_FORMAT(SER_TM,'%Y') = #{year} and d.PRO_ID = #{proId}")
+    List<Map<String,Object>> listBusDevServiceByYear(@Param("year") String year,@Param("proId") String proId);
 
     /**
      * Delete device inspect int.
@@ -77,6 +77,6 @@ public interface MaintenanceRepository extends BaseMapper<BusDevService> {
      * @param year the year
      * @return the list
      */
-    @Select("SELECT DISTINCT  DATE_FORMAT(SER_TM,'%m') AS month,DATE_FORMAT(SER_TM,'%d') AS day FROM `bus_dev_service`")
-    List<Map<String, Object>> listDevDate(@Param("year") String year);
+    @Select("SELECT DISTINCT  DATE_FORMAT(SER_TM,'%m') AS month,DATE_FORMAT(SER_TM,'%d') AS day FROM `bus_dev_service` a left join bus_device b on a.DEV_ID = b.DEV_ID where b.PRO_ID = #{proId}")
+    List<Map<String, Object>> listDevDate(@Param("year") String year,@Param("proId") String proId);
 }

src/main/java/org/rcisoft/business/device/maintenance/service/MaintenanceService.java

@@ -64,7 +64,7 @@ public interface MaintenanceService {
      * @param date the date
      * @return the list
      */
-    List<Map<String,Object>> listBusDevServiceByDate(String date);
+    List<Map<String,Object>> listBusDevServiceByDate(String date,String proId);
 
 
     /**
@@ -74,7 +74,7 @@ public interface MaintenanceService {
      * @param year the year
      * @return the list
      */
-    List<Map<String,Object>> listBusDevServiceByYear(String year);
+    List<Map<String,Object>> listBusDevServiceByYear(String year,String proId);
 
 
     /**
@@ -84,5 +84,5 @@ public interface MaintenanceService {
      * @param year the year
      * @return the list
      */
-    List<Map<String, Object>> listDevDate(String year);
+    List<Map<String, Object>> listDevDate(String year,String proId);
 }

src/main/java/org/rcisoft/business/device/maintenance/service/impl/MaintenanceServiceImpl.java

@@ -95,8 +95,8 @@ public class    MaintenanceServiceImpl implements MaintenanceService {
      * @return
      */
     @Override
-    public List<Map<String,Object>> listBusDevServiceByDate(String date) {
-        List<Map<String,Object>> busDevServices = maintenanceRepository.listBusDevServiceByDate(date);
+    public List<Map<String,Object>> listBusDevServiceByDate(String date,String proId) {
+        List<Map<String,Object>> busDevServices = maintenanceRepository.listBusDevServiceByDate(date,proId);
         return busDevServices;
     }
 
@@ -106,8 +106,8 @@ public class    MaintenanceServiceImpl implements MaintenanceService {
      * @return
      */
     @Override
-    public List<Map<String,Object>> listBusDevServiceByYear(String year) {
-        List<Map<String,Object>> busDevServices = maintenanceRepository.listBusDevServiceByYear(year);
+    public List<Map<String,Object>> listBusDevServiceByYear(String year,String proId) {
+        List<Map<String,Object>> busDevServices = maintenanceRepository.listBusDevServiceByYear(year,proId);
         return busDevServices;
     }
 
@@ -118,8 +118,8 @@ public class    MaintenanceServiceImpl implements MaintenanceService {
      * @return the list
      */
     @Override
-    public List<Map<String, Object>> listDevDate(String year) {
-        List<Map<String,Object>> mapList=maintenanceRepository.listDevDate(year);
+    public List<Map<String, Object>> listDevDate(String year,String proId) {
+        List<Map<String,Object>> mapList=maintenanceRepository.listDevDate(year,proId);
         return mapList;
     }
 }

src/main/java/org/rcisoft/business/mainte/energyplan/dao/BusEnergyPlanRepository.java

@@ -156,5 +156,13 @@ public interface BusEnergyPlanRepository extends BaseMapper<BusEnergyPlan> {
      */
     @Select("<script>delete from bus_energy_plan where dev_num = #{dev_num} and DATE_FORMAT(tm,'%Y-%m-%d') = #{day}</script>")
     void deleteEnergyPlanDay(Map<String,Object> map);
+
+    /**
+     * 删除项目某一天的能耗计划
+     * @param day
+     * @param proId
+     */
+    @Select("<script>delete from bus_energy_plan where DATE_FORMAT(tm,'%Y-%m-%d') = #{day} and dev_num in (select dev_num from bus_device where pro_id = #{proId})</script>")
+    void deleteEnergyPlan(@Param("day") String day,@Param("proId") String proId);
 }
 

src/main/java/org/rcisoft/business/mainte/energyplan/dao/BusEnergyplanTRepository.java

@@ -22,6 +22,14 @@ public interface BusEnergyplanTRepository extends BaseMapper<BusEnergyplanT> {
             " and day = #{day} </script>")
     List<Map<String,Object>> queryBusEnergyplanTs(@Param("devNum") String devNum,@Param("day") String day);
 
+    /**
+     * 删除项目某一天的能耗计划概览
+     * @param day
+     * @param proId
+     */
+    @Select("<script>delete from bus_energyplan_t where day = #{day} and dev_num in (select dev_num from bus_device where pro_id = #{proId})</script>")
+    void deleteEnergyPlanT(@Param("day") String day,@Param("proId") String proId);
+
 
     /**
      *查询单个项目某一天的能耗计划概览

src/main/java/org/rcisoft/business/mainte/energyplan/service/BusEnergyPlanService.java

@@ -82,6 +82,14 @@ public interface BusEnergyPlanService {
 
     PersistModel energyPlanCopy(String proId,String day,String copyDays);
 
+    /**
+     * 删除项目某一天的能耗计划
+     * @param day
+     * @param proId
+     * @return
+     */
+    Boolean deleteEnergyDay(String day,String proId);
+
 
 
 }

src/main/java/org/rcisoft/business/mainte/energyplan/service/impl/BusEnergyPlanServiceImpl.java

@@ -143,9 +143,11 @@ public class BusEnergyPlanServiceImpl implements BusEnergyPlanService {
         }
         if(flag){
             List<EnergyPlanVo> epList = energyPlanlist.getEnergyPlanVoList();
-            for(EnergyPlanVo energyPlanVo : epList){
+            PersistModel p = null;
                 try{
-                    PersistModel p =  save(energyPlanVo);
+                    for(EnergyPlanVo energyPlanVo : epList) {
+                        p = save(energyPlanVo);
+                    }
                     if(p.isSuccessBySinglePersist()){
                         busEnergyplanTService.save(busEnergyplanTList);
                     }
@@ -153,7 +155,6 @@ public class BusEnergyPlanServiceImpl implements BusEnergyPlanService {
                     line = 0;
                     message = "系统错误，操作失败";
                 }
-            }
         }else{
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             message = "系统错误，操作失败";
@@ -359,29 +360,33 @@ public class BusEnergyPlanServiceImpl implements BusEnergyPlanService {
         SimpleDateFormat simple = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try{
             for(String newDay : copyDayList){
-                for(Map<String,Object> mp : planList){
-                    BusEnergyPlan be = new BusEnergyPlan();
-                    be.setDevNum(mp.get("DEV_NUM").toString());
-                    be.setParam(mp.get("PARAM").toString());
-                    be.setParamVal(Float.valueOf(mp.get("PARAM_VAL").toString()));
-                    be.setPower(Float.valueOf(mp.get("POWER").toString()));
-                    be.setGasSpeed(Float.valueOf(mp.get("GAS_SPEED").toString()));
-                    be.setTm(simple.parse(newDay +" "+ simple.format(mp.get("TM")).substring(11)));
-                    busEnergyPlanRepository.insertSelective(be);
-                }
-                for(Map<String,Object> mp : plantList){
-                    BusEnergyplanT bt = new BusEnergyplanT();
-                    bt.setDevNum(mp.get("DEV_NUM").toString());
-                    bt.setDevTpId(mp.get("DEV_TP_ID").toString());
-                    bt.setStartTm(mp.get("START_TM").toString());
-                    bt.setEndTm(mp.get("END_TM").toString());
-                    bt.setValOne(mp.get("VAL_ONE").toString());
-                    bt.setValTwo(mp.get("VAL_TWO").toString());
-                    bt.setValThree(mp.get("VAL_THREE").toString());
-                    bt.setCompareVal(mp.get("COMPARE_VAL").toString());
-                    bt.setId(UUID.randomUUID().toString().replace("-",""));
-                    bt.setDay(newDay);
-                    busEnergyplanTRepository.insert(bt);
+                if(deleteEnergyDay(newDay, proId)){
+                    for(Map<String,Object> mp : planList){
+                        BusEnergyPlan be = new BusEnergyPlan();
+                        be.setDevNum(mp.get("DEV_NUM").toString());
+                        be.setParam(mp.get("PARAM").toString());
+                        be.setParamVal(Float.valueOf(mp.get("PARAM_VAL").toString()));
+                        be.setPower(Float.valueOf(mp.get("POWER").toString()));
+                        be.setGasSpeed(Float.valueOf(mp.get("GAS_SPEED").toString()));
+                        be.setTm(simple.parse(newDay +" "+ simple.format(mp.get("TM")).substring(11)));
+                        busEnergyPlanRepository.insertSelective(be);
+                    }
+                    for(Map<String,Object> mp : plantList){
+                        BusEnergyplanT bt = new BusEnergyplanT();
+                        bt.setDevNum(mp.get("DEV_NUM").toString());
+                        bt.setDevTpId(mp.get("DEV_TP_ID").toString());
+                        bt.setStartTm(newDay +" "+ mp.get("START_TM").toString().substring(11));
+                        bt.setEndTm(newDay +" "+ mp.get("END_TM").toString().substring(11));
+                        bt.setValOne(mp.get("VAL_ONE").toString());
+                        bt.setValTwo(mp.get("VAL_TWO").toString());
+                        bt.setValThree(mp.get("VAL_THREE").toString());
+                        bt.setCompareVal(mp.get("COMPARE_VAL").toString());
+                        bt.setId(UUID.randomUUID().toString().replace("-",""));
+                        bt.setDay(newDay);
+                        busEnergyplanTRepository.insert(bt);
+                    }
+                }else{
+                    message = "能耗计划清除失败，无法复制";
                 }
             }
         }catch(Exception e){
@@ -393,5 +398,17 @@ public class BusEnergyPlanServiceImpl implements BusEnergyPlanService {
         return new PersistModel(line,message);
     }
 
+    @Override
+    public Boolean deleteEnergyDay(String day, String proId) {
+        try{
+            busEnergyPlanRepository.deleteEnergyPlan(day, proId);
+            busEnergyplanTRepository.deleteEnergyPlanT(day, proId);
+        }catch(Exception e){
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
 
 }

src/main/java/org/rcisoft/business/mainte/paramlibrary/dao/ParamLibraryRepository.java

@@ -19,7 +19,7 @@ public interface ParamLibraryRepository extends BaseMapper<BusParamLibrary>{
      */
     @Select("<script>SELECT\n" +
             "\ta.param,\n" +
-            "\tc.param_nm\n" +
+            "\tc.param_nm,a.compare_flag\n" +
             "FROM\n" +
             "\tbus_library_param a,\n" +
             "\tbus_device_param b,\n" +