项目标准后台维护

src/main/java/org/rcisoft/business/device/assets/controller/BusDeviceController.java

@@ -61,7 +61,7 @@ public class BusDeviceController extends PaginationController<BusDevice> {
     }
 
     @ApiOperation(value="删除设备", notes="删除设备")
-    @PutMapping("/delete")
+    @DeleteMapping("/delete")
     public Result delete(@RequestParam String devid) {
         PersistModel data = busDeviceServiceImpl.delete(devid);
         return Result.builder(data);

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

@@ -60,20 +60,14 @@ public class BusDeviceParamController extends PaginationController<BusDevicePara
         }else{
             data = busDeviceParamServiceImpl.save(busDeviceParamList);
         }
-        return Result.builder(data,
-                MessageConstant.MESSAGE_ALERT_SUCCESS,
-                MessageConstant.MESSAGE_ALERT_ERROR,
-                busDeviceParamList);
+        return Result.builder(data);
     }
 
     @ApiOperation(value="删除设备参数模板", notes="删除设备参数模板")
-    @PutMapping("/delete")
+    @DeleteMapping("/delete")
     public Result delete(@RequestParam String devNum) {
         PersistModel data = busDeviceParamServiceImpl.delete(devNum);
-        return Result.builder(data,
-                MessageConstant.MESSAGE_ALERT_SUCCESS,
-                MessageConstant.MESSAGE_ALERT_ERROR,
-                devNum);
+        return Result.builder(data);
     }
 
     @ApiOperation(value="查看单个设备的参数模板", notes="查看单个设备的参数模板")

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

@@ -63,7 +63,7 @@ public class BusLibraryParamController extends PaginationController<BusLibraryPa
     }
 
     @ApiOperation(value="删除设备参数库模板", notes="删除设备参数库模板")
-    @PutMapping("/delete")
+    @DeleteMapping("/delete")
     public Result delete(@RequestParam String devNum) {
         PersistModel data = busLibraryParamServiceImpl.delete(devNum);
         return Result.builder(data,

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

+package org.rcisoft.business.manage.controller;
+
+
+/*固定导入*/
+import io.swagger.annotations.ApiOperation;
+import org.rcisoft.business.manage.service.BusProjectAreaService;
+import org.rcisoft.business.manage.vo.BusProjectAreaList;
+import org.rcisoft.business.overview.entity.BusProjectArea;
+import org.rcisoft.core.controller.PaginationController;
+import org.rcisoft.core.model.GridModel;
+import org.rcisoft.core.model.PersistModel;
+import org.rcisoft.core.result.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* Created by  on 2018-5-16 14:34:55.
+*/
+@RestController
+@RequestMapping("busprojectarea")
+public class BusProjectAreaController extends PaginationController<BusProjectArea> {
+
+    @Autowired
+    private BusProjectAreaService busProjectAreaServiceImpl;
+
+
+    @ApiOperation(value="修改", notes="修改")
+    @PutMapping("/update")
+    public Result update(@RequestBody BusProjectAreaList busProjectAreaList) {
+        PersistModel data = busProjectAreaServiceImpl.merge(busProjectAreaList);
+        return Result.builder(data);
+    }
+
+    @ApiOperation(value="查看  集合", notes="查看  集合")
+    @GetMapping(value = "/queryBusProjectArea")
+    public List<Map<String, Object>> queryBusProjectArea(@RequestParam String proId) {
+        return busProjectAreaServiceImpl.queryBusProjectArea(proId);
+    }
+}

src/main/java/org/rcisoft/business/manage/service/BusProjectAreaService.java

+package org.rcisoft.business.manage.service;
+
+import org.rcisoft.business.manage.vo.BusProjectAreaList;
+import org.rcisoft.core.model.PersistModel;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by  on 2018-5-16 14:34:55.
+ */
+public interface BusProjectAreaService {
+
+    /**
+    * 保存
+    * @return
+    */
+    PersistModel save(BusProjectAreaList busProjectAreaList);
+
+    /**
+    * 修改
+    * @return
+    */
+    PersistModel merge(BusProjectAreaList busProjectAreaList);
+
+    /**
+     * 删除
+     * @return
+     */
+    PersistModel delete(String proId);
+
+
+    /**
+    * 分页查询
+    * @return
+    */
+    List<Map<String,Object>> queryBusProjectArea(String proId);
+
+
+
+
+}

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

@@ -43,7 +43,7 @@ public class BusDeviceParamServiceImpl implements BusDeviceParamService {
             bp.setId(UUID.randomUUID().toString().replace("-",""));
             line = busDeviceParamRepository.insertSelective(bp);
         }
-        return new PersistModel(line);
+        return new PersistModel(line,"");
     }
 
     /**
@@ -54,6 +54,7 @@ public class BusDeviceParamServiceImpl implements BusDeviceParamService {
     @Override
     public PersistModel delete(String devNum){
         int line = 0;
+        String message = "";
         Example example = new Example(BusDeviceParam.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("devNum",devNum);
@@ -61,8 +62,10 @@ public class BusDeviceParamServiceImpl implements BusDeviceParamService {
         map.put("dev_num",devNum);
         if(busDeviceParamRepository.queryLibraryParamByDev(map)==null || busDeviceParamRepository.queryLibraryParamByDev(map).size()<1){
             line = busDeviceParamRepository.deleteByExample(example);
+        }else{
+            message = "关联参数库模板不为空，无法操作";
         }
-        return new PersistModel(line);
+        return new PersistModel(line,message);
     }
 
     /**
@@ -73,11 +76,14 @@ public class BusDeviceParamServiceImpl implements BusDeviceParamService {
     @Override
     public PersistModel merge(BusDeviceParamList busDeviceParamList){
         int line = 0;
+        String message = "";
         PersistModel pm = delete(busDeviceParamList.getBusDeviceParamList().get(0).getDevNum());
         if(pm.isSuccessBySinglePersist()){
             return save(busDeviceParamList);
+        }else{
+            message = "关联参数库模板不为空，无法操作";
         }
-        return new PersistModel(line);
+        return new PersistModel(line,message);
     }
 
     /**

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

+package org.rcisoft.business.manage.service.impl;
+
+import lombok.extern.slf4j.Slf4j;
+import org.rcisoft.business.manage.entity.BusFactory;
+import org.rcisoft.business.manage.service.BusProjectAreaService;
+import org.rcisoft.business.manage.vo.BusProjectAreaList;
+import org.rcisoft.business.overview.dao.BusProjectAreaRepository;
+import org.rcisoft.business.overview.entity.BusProjectArea;
+import org.rcisoft.core.model.PersistModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import redis.clients.jedis.Transaction;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by  on 2018-5-16 14:34:55.
+ */
+@Service
+@Transactional(readOnly = true,propagation = Propagation.NOT_SUPPORTED)
+@Slf4j
+public class BusProjectAreaServiceImpl implements BusProjectAreaService {
+
+    @Autowired
+    private BusProjectAreaRepository busProjectAreaRepository;
+
+
+    /**
+    * 保存 busProjectArea
+     * 新增项目时添加
+    * @return
+    */
+    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
+    @Override
+    public PersistModel save(BusProjectAreaList busProjectAreaList){
+        int line = 0;
+        List<BusProjectArea> list  = busProjectAreaList.getBusProjectAreaList();
+        for(BusProjectArea busProjectArea : list){
+            line = busProjectAreaRepository.insertSelective(busProjectArea);
+        }
+        return new PersistModel(line);
+    }
+
+    /**
+    * 修改 busProjectArea
+    * @return
+    */
+    @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
+    @Override
+    public PersistModel merge(BusProjectAreaList busProjectAreaList){
+        int line = 1;
+        String message = "";
+        List<BusProjectArea> list  = busProjectAreaList.getBusProjectAreaList();
+        for(BusProjectArea busProjectArea : list){
+            Example example = new Example(BusProjectArea.class);
+            Example.Criteria criteria = example.createCriteria();
+            criteria.andEqualTo("id",busProjectArea.getId());
+            if(busProjectArea.getId()!=null && !busProjectArea.getId().equals("")){
+                line = busProjectAreaRepository.updateByExampleSelective(busProjectArea,example);
+            }else{
+                line = 0;
+                message = "ID为空，更新失败";
+                return new PersistModel(line,message);
+            }
+        }
+        return new PersistModel(line,message);
+    }
+
+    @Override
+    public PersistModel delete(String proId) {
+        int line = 0;
+        String message = "";
+        Example example = new Example(BusProjectArea.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("proId",proId);
+        if(proId!=null && !proId.equals("")){
+            line = busProjectAreaRepository.deleteByExample(example);
+        }else{
+            line = 0;
+            message = "项目ID为空，删除失败";
+        }
+        return new PersistModel(line,message);
+    }
+
+    @Override
+    public List<Map<String, Object>> queryBusProjectArea(String proId) {
+        return busProjectAreaRepository.queryBusProjectArea(proId);
+    }
+
+}

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

@@ -2,8 +2,11 @@ package org.rcisoft.business.manage.service.impl;
 
 import lombok.extern.slf4j.Slf4j;
 import org.rcisoft.business.manage.entity.BusProject;
+import org.rcisoft.business.manage.service.BusProjectAreaService;
 import org.rcisoft.business.manage.service.BusProjectService;
+import org.rcisoft.business.manage.vo.BusProjectAreaList;
 import org.rcisoft.business.overview.dao.BusProjectRepository;
+import org.rcisoft.business.overview.entity.BusProjectArea;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.business.manage.dao.ProjectRepository;
@@ -14,9 +17,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Created by  on 2018-5-2 16:09:30.
@@ -30,6 +31,8 @@ public class BusProjectServiceImpl implements BusProjectService {
     private ProjectRepository projectRepository;
     @Autowired
     private BusProjectRepository busProjectRepository;
+    @Autowired
+    private BusProjectAreaService busProjectAreaService;
 
 
     /**
@@ -51,6 +54,29 @@ public class BusProjectServiceImpl implements BusProjectService {
             return new PersistModel(line,message);
         }
         line = projectRepository.insertSelective(busProject);
+        //新增项目成功后，添加项目能耗标准、24小时的能耗价格
+        if(line>0){
+            //能耗标准
+            BusProjectAreaList busProjectAreaList = new BusProjectAreaList();
+            List<BusProjectArea> list = new ArrayList<BusProjectArea>();
+            BusProjectArea a1 = new BusProjectArea();
+            a1.setId(UUID.randomUUID().toString().replace("-",""));
+            a1.setProId(busProject.getJwnum());
+            a1.setType("1");
+            list.add(a1);
+            BusProjectArea a2 = new BusProjectArea();
+            a2.setId(UUID.randomUUID().toString().replace("-",""));
+            a2.setProId(busProject.getJwnum());
+            a2.setType("2");
+            list.add(a2);
+            BusProjectArea a3 = new BusProjectArea();
+            a3.setId(UUID.randomUUID().toString().replace("-",""));
+            a3.setProId(busProject.getJwnum());
+            a3.setType("3");
+            list.add(a3);
+            busProjectAreaList.setBusProjectAreaList(list);
+            return  busProjectAreaService.save(busProjectAreaList);
+        }
         return new PersistModel(line);
     }
 
@@ -96,7 +122,9 @@ public class BusProjectServiceImpl implements BusProjectService {
         }else{
             message = "ID为空，删除失败";
         }
-
+        if(line>0){
+            return busProjectAreaService.delete(busProject.getProId());
+        }
         return new PersistModel(line,message);
     }
 

src/main/java/org/rcisoft/business/manage/vo/BusProjectAreaList.java

+package org.rcisoft.business.manage.vo;
+
+import org.rcisoft.business.overview.entity.BusProjectArea;
+
+import java.util.List;
+
+public class BusProjectAreaList {
+    private List<BusProjectArea> busProjectAreaList;
+
+    public List<BusProjectArea> getBusProjectAreaList() {
+        return busProjectAreaList;
+    }
+
+    public void setBusProjectAreaList(List<BusProjectArea> busProjectAreaList) {
+        this.busProjectAreaList = busProjectAreaList;
+    }
+}

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

 package org.rcisoft.business.overview.dao;
 
+import org.apache.ibatis.annotations.Param;
 import org.rcisoft.business.overview.entity.BusProjectArea;
 import org.rcisoft.business.overview.vo.BusProjectAreaVo;
 import org.rcisoft.core.base.BaseMapper;
@@ -9,6 +10,7 @@ import org.springframework.stereotype.Repository;
 
 
 import java.util.List;
+import java.util.Map;
 
 /**
 * Created with  on 2018-4-13 13:51:00.
@@ -28,5 +30,13 @@ public interface BusProjectAreaRepository extends BaseMapper<BusProjectArea> {
 //    @Select("<script>select SUM(IF(b.TYPE=1, b.AREA, 0)) as WATER_AREA,SUM(IF(b.TYPE=2, b.AREA, 0)) as ELEC_AREA,SUM(IF(b.TYPE=3, b.AREA, 0)) as GAS_AREA from bus_project_area b where b.PRO_ID=#{proId}</script>")
 //    @ResultMap(value = "vo")
 //    BusProjectAreaVo classifyProjectArea(String proId);
+
+    /**
+     * 查询项目标准
+     * @param proId
+     * @return
+     */
+    @Select("<script>select * from bus_project_area where pro_id = #{proId}</script>")
+    List<Map<String,Object>> queryBusProjectArea(@Param("proId") String proId);
 }