计划编制批量插入

src/main/java/org/rcisoft/business/mainte/energyplan/controller/BusEnergyPlanController.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.rcisoft.business.mainte.energyplan.entity.BusEnergyPlan;
 import org.rcisoft.business.mainte.energyplan.service.BusEnergyPlanService;
+import org.rcisoft.business.mainte.energyplan.vo.EnergyPlanList;
 import org.rcisoft.business.mainte.energyplan.vo.EnergyPlanVo;
 import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.controller.PaginationController;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 
@@ -36,12 +38,15 @@ public class BusEnergyPlanController extends PaginationController<BusEnergyPlan>
     @ApiOperation(value="添加", notes="添加")
     //@ApiImplicitParams({@ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
     @PostMapping(value = "/add")
-    public Result add(@Valid EnergyPlanVo energyPlan) throws Exception{
-        PersistModel data = busEnergyPlanServiceImpl.save(energyPlan);
-        return Result.builder(data,
+    public Result add(@Valid EnergyPlanList energyPlanlist) throws Exception{
+        List<EnergyPlanVo> epList = energyPlanlist.getEnergyPlanVoList();
+        for(EnergyPlanVo energyPlanVo : epList){
+            busEnergyPlanServiceImpl.save(energyPlanVo);
+        }
+        return Result.builder(new PersistModel(1),
             MessageConstant.MESSAGE_ALERT_SUCCESS,
             MessageConstant.MESSAGE_ALERT_ERROR,
-                energyPlan);
+                null);
     }
 
     @ApiOperation(value="逻辑删除", notes="逻辑删除")

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

@@ -31,23 +31,23 @@ public interface ParamLibraryRepository {
      * 根据设备编码获取第一个参数集合
      * @return
      */
-    @Select("<script>select distinct p1_v from bus_param_library where dev_num = #{dev_num} "
+    @Select("<script>select distinct p1_v from bus_param_library where dev_num = #{dev_num} and year = #{year} "
             + "</script>")
     List<Map<String,Object>> queryPlanParamVal_1(Map<String,Object> map);
     /**
      * 根据设备编码及第一个参数获取第二个参数集合
      * @return
      */
-    @Select("<script>select distinct p2_v from bus_param_library where dev_num = #{dev_num}" +
-            " and p1_v = #{p1_v} "
+    @Select("<script>select distinct p1_v,p2_v,p3_v,power,gas_speed from bus_param_library where dev_num = #{dev_num}" +
+            " and p1_v = #{p1_v}  and year = #{year} "
             + "</script>")
     List<Map<String,Object>> queryPlanParamVal_2(Map<String,Object> map);
     /**
      * 根据设备编码及前两个参数获取第三个参数集合
      * @return
      */
-    @Select("<script>select distinct p3_v from bus_param_library where dev_num = #{dev_num}" +
-            " and p1_v = #{p1_v} and p2_v = #{p2_v} "
+    @Select("<script>select distinct p1_v,p2_v,p3_v,power,gas_speed from bus_param_library where dev_num = #{dev_num}" +
+            " and p1_v = #{p1_v} and p2_v = #{p2_v}  and year = #{year} "
             + "</script>")
     List<Map<String,Object>> queryPlanParamVal_3(Map<String,Object> map);
 

src/main/java/org/rcisoft/business/mainte/paramlibrary/service/impl/ParamLibraryServiceImpl.java

@@ -8,6 +8,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -25,16 +27,22 @@ public class ParamLibraryServiceImpl implements ParamLibraryService {
 
     @Override
     public List<Map<String, Object>> queryPlanParamVal_1(Map<String, Object> map) {
+        SimpleDateFormat simple = new SimpleDateFormat("yyyy");
+        map.put("year",simple.format(new Date()));
         return paramLibraryRepository.queryPlanParamVal_1(map);
     }
 
     @Override
     public List<Map<String, Object>> queryPlanParamVal_2(Map<String, Object> map) {
+        SimpleDateFormat simple = new SimpleDateFormat("yyyy");
+        map.put("year",simple.format(new Date()));
         return paramLibraryRepository.queryPlanParamVal_2(map);
     }
 
     @Override
     public List<Map<String, Object>> queryPlanParamVal_3(Map<String, Object> map) {
+        SimpleDateFormat simple = new SimpleDateFormat("yyyy");
+        map.put("year",simple.format(new Date()));
         return paramLibraryRepository.queryPlanParamVal_3(map);
     }