Merge branch 'develop' of ssh://103.249.252.28:10022/wangxiahui/zhny into develop

src/main/java/org/rcisoft/business/manage/controller/BusSavingController.java

@@ -29,14 +29,14 @@ public class BusSavingController {
     private BusSavingService busSavingServiceImpl;
 
     @ApiOperation(value="修改", notes="传list对象")
-    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "字符串"),
+/*    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "主键", required = true, dataType = "字符串"),
             @ApiImplicitParam(name = "examiner", value = "检定员", dataType = "字符串"),
             @ApiImplicitParam(name = "qualification", value = "执业资质", dataType = "字符串"),
             @ApiImplicitParam(name = "tm", value = "从业时间", dataType = "字符串"),
             @ApiImplicitParam(name = "performance", value = "项目业绩", dataType = "字符串"),
             @ApiImplicitParam(name = "type", value = "1：工程造价认定，2：节能认定", dataType = "字符串"),
             @ApiImplicitParam(name = "proId", value = "项目表主键", dataType = "字符串，可以不传")
-    })
+    })*/
     @RequestMapping("/update")
     public Result update(@RequestBody List<BusSaving> busSavingList) {
         return Result.builder(busSavingServiceImpl.update(busSavingList));

src/main/java/org/rcisoft/business/manage/entity/BusProject.java

@@ -61,5 +61,21 @@ public class BusProject{
      private String topology;
 
      private BigDecimal shutPower;
+
+     private String bldNm;
+
+     private String proType;
+
+     private String saveContent;
+
+     private String saveCost;
+
+     private String saveShare;
+
+     private String saveMethod;
+
+     private String saveEstimate;
+
+     private String saveFlag;
 }
 

src/main/java/org/rcisoft/business/manage/service/impl/BusProjectServiceImpl.java

@@ -2,8 +2,10 @@ package org.rcisoft.business.manage.service.impl;
 
 import lombok.extern.slf4j.Slf4j;
 import org.rcisoft.business.manage.entity.BusProject;
+import org.rcisoft.business.manage.entity.BusSaving;
 import org.rcisoft.business.manage.service.BusProjectAreaService;
 import org.rcisoft.business.manage.service.BusProjectService;
+import org.rcisoft.business.manage.service.BusSavingService;
 import org.rcisoft.business.manage.service.EnergyPriceService;
 import org.rcisoft.business.manage.vo.BusProjectAreaList;
 import org.rcisoft.business.manage.vo.EnergyPriceList;
@@ -39,6 +41,8 @@ public class BusProjectServiceImpl implements BusProjectService {
     private BusProjectAreaService busProjectAreaService;
     @Autowired
     private EnergyPriceService energyPriceService;
+    @Autowired
+    private BusSavingService busSavingService;
 
 
     /**
@@ -107,6 +111,21 @@ public class BusProjectServiceImpl implements BusProjectService {
             }
             energyPriceList.setEnergyPriceList(plist);
             PersistModel priceP =  energyPriceService.save(energyPriceList);
+            //项目认定
+            if(busProject.getSaveFlag()!=null && busProject.getSaveFlag().equals("1")){
+                List<BusSaving> busSavingList = new ArrayList<>();
+                BusSaving bs1 = new BusSaving();
+                bs1.setId(UUID.randomUUID().toString().replace("-",""));
+                bs1.setProId(busProject.getJwnum());
+                bs1.setType("1");
+                BusSaving bs2 = new BusSaving();
+                bs2.setId(UUID.randomUUID().toString().replace("-",""));
+                bs2.setProId(busProject.getJwnum());
+                bs2.setType("2");
+                busSavingList.add(bs1);
+                busSavingList.add(bs2);
+                PersistModel saveP = busSavingService.save(busSavingList);
+            }
             if(!areaP.isSuccessBySinglePersist()){
                 return areaP;
             }
@@ -161,14 +180,21 @@ public class BusProjectServiceImpl implements BusProjectService {
             message = "ID为空，删除失败";
         }
         if(line>0){
+            //删除项目标准信息
             PersistModel areaP = busProjectAreaService.delete(busProject.getProId());
+            //删除能耗价格信息
             PersistModel priceP = energyPriceService.delete(busProject.getProId());
+            //删除项目认定信息
+            PersistModel saveP = busSavingService.delete(busProject.getProId());
             if(!areaP.isSuccessBySinglePersist()){
                 return areaP;
             }
             if(!priceP.isSuccessBySinglePersist()){
                 return priceP;
             }
+            if(!saveP.isSuccessBySinglePersist()){
+                return saveP;
+            }
         }
         return new PersistModel(line,message);
     }

src/main/java/org/rcisoft/business/manage/service/impl/BusSavingServiceImpl.java

@@ -27,7 +27,7 @@ public class BusSavingServiceImpl implements BusSavingService {
     public PersistModel save(List<BusSaving> busSavingList) {
         int result = 0;
         for (BusSaving busSaving : busSavingList) {
-            result += busSavingRepository.insert(busSaving);
+            result += busSavingRepository.insertSelective(busSaving);
         }
         return new PersistModel(result);
     }
@@ -43,7 +43,7 @@ public class BusSavingServiceImpl implements BusSavingService {
             String id = busSaving.getId();
             criteria.andEqualTo("id", id);
             if (StringUtils.isNotEmpty(id)) {
-                result += busSavingRepository.updateByExample(busSaving, criteria);
+                result += busSavingRepository.updateByExampleSelective(busSaving, example);
                 message = "更新成功";
             } else {
                 message = "ID为空，更新失败";
@@ -61,7 +61,7 @@ public class BusSavingServiceImpl implements BusSavingService {
         Example.Criteria criteria = example.createCriteria();
         if (StringUtils.isNotEmpty(proId)) {
             criteria.andEqualTo("proId", proId);
-            result += busSavingRepository.deleteByExample(criteria);
+            result += busSavingRepository.deleteByExample(example);
             message = "删除成功";
         } else {
             message = "项目ID为空，删除失败";
@@ -74,6 +74,6 @@ public class BusSavingServiceImpl implements BusSavingService {
         Example example = new Example(BusSaving.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("proId", proId);
-        return busSavingRepository.selectByExample(criteria);
+        return busSavingRepository.selectByExample(example);
     }
 }

src/main/java/org/rcisoft/business/manage/service/impl/EnergyPriceServiceImpl.java

@@ -91,11 +91,11 @@ public class EnergyPriceServiceImpl implements EnergyPriceService {
         Map<String, Object> gas_map = new HashMap<>();
         for(Map<String, Object> mp : list){
             if(mp.get("P_TP")!=null && mp.get("P_TP").toString().equals("1")){
-                water_map.put(mp.get("P_HOUR").toString(),mp.get("P_PRICE"));
+                water_map.put(mp.get("P_HOUR").toString(),mp.get("P_PRICE")+","+mp.get("ID"));
             }else if(mp.get("P_TP")!=null && mp.get("P_TP").toString().equals("2")){
-                power_map.put(mp.get("P_HOUR").toString(),mp.get("P_PRICE"));
+                power_map.put(mp.get("P_HOUR").toString(),mp.get("P_PRICE")+","+mp.get("ID"));
             }else if(mp.get("P_TP")!=null && mp.get("P_TP").toString().equals("3")){
-                gas_map.put(mp.get("P_HOUR").toString(),mp.get("P_PRICE"));
+                gas_map.put(mp.get("P_HOUR").toString(),mp.get("P_PRICE")+","+mp.get("ID"));
             }
         }
         result.put("water",water_map);

src/main/java/org/rcisoft/business/overview/dao/EnergyPriceRepository.java

@@ -23,7 +23,7 @@ public interface EnergyPriceRepository extends BaseMapper<EnergyPriceVo> {
      * @return
      */
     @Select("<script>select e.P_HOUR,SUM(IF(e.P_TP=1, e.P_PRICE, 0)) as WATER,SUM(IF(e.P_TP=2, e.P_PRICE, 0)) as ELEC,SUM(IF(e.P_TP=3, e.P_PRICE, 0)) as GAS from energy_price e where e.PRO_ID=#{proId} and e.P_HOUR=#{pHour}</script>")
-    @ResultMap("vo")
+    @ResultMap("BaseResultMap")
     EnergyPriceVo getPrice(@Param("proId") String proId,@Param("pHour") String pHour);
 
     /**

src/main/java/org/rcisoft/mqttclient/MqttClient.java

@@ -161,7 +161,7 @@ public class MqttClient {
             MQTT mqtt=new MQTT();
 
             //MQTT设置说明
-            mqtt.setHost("tcp://120.52.179.76:1883");
+            mqtt.setHost("tcp://139.199.98.105:1883");
             mqtt.setClientId("876543210"); //用于设置客户端会话的ID。在setCleanSession(false);被调用时，MQTT服务器利用该ID获得相应的会话。此ID应少于23个字符，默认根据本机地址、端口和时间自动生成
             mqtt.setCleanSession(false); //若设为false，MQTT服务器将持久化客户端会话的主体订阅和ACK位置，默认为true
             mqtt.setKeepAlive((short) 60);//定义客户端传来消息的最大时间间隔秒数，服务器可以据此判断与客户端的连接是否已经断开，从而避免TCP/IP超时的长时间等待