系统管理bug修改

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

@@ -35,7 +35,7 @@ public class BusDeviceMeterController extends PaginationController<BusDeviceMete
 
 
     @ApiOperation(value="修改表具", notes="修改表具")
-    @PutMapping("/update")
+    @PostMapping("/update")
     public Result update(@Valid BusDeviceMeter busDeviceMeter) {
         PersistModel data = busDeviceMeterServiceImpl.merge(busDeviceMeter);
         return Result.builder(data);

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

@@ -40,7 +40,7 @@ public class BusDeviceParamController extends PaginationController<BusDevicePara
 
 
     @ApiOperation(value="修改设备参数模板", notes="修改设备参数模板")
-    @PutMapping("/update")
+    @PostMapping("/update")
     public Result update(@RequestBody BusDeviceParamList busDeviceParamList) {
         PersistModel data = busDeviceParamServiceImpl.merge(busDeviceParamList);
         return Result.builder(data,

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

@@ -43,7 +43,7 @@ public class BusDeviceTpController extends PaginationController<BusDeviceTp> {
 
 
     @ApiOperation(value="修改设备类型", notes="修改设备类型")
-    @PutMapping("/update")
+    @PostMapping("/update")
     public Result update(@Valid BusDeviceTp busDeviceTp) {
         PersistModel data = busDeviceTpServiceImpl.merge(busDeviceTp);
         return Result.builder(data,

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

@@ -44,7 +44,7 @@ public class BusFactoryController extends PaginationController<BusFactory> {
 
 
     @ApiOperation(value="修改", notes="修改")
-    @PutMapping("/update")
+    @PostMapping("/update")
     public Result update(@Valid BusFactory busFactory) {
         PersistModel data = busFactoryServiceImpl.merge(busFactory);
         return Result.builder(data);

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

@@ -40,7 +40,7 @@ public class BusLibraryParamController extends PaginationController<BusLibraryPa
 
 
     @ApiOperation(value="修改设备参数库模板", notes="修改设备参数库模板")
-    @PutMapping("/update")
+    @PostMapping("/update")
     public Result update(@RequestBody BusLibraryParamList busLibraryParamList) {
         PersistModel data = busLibraryParamServiceImpl.merge(busLibraryParamList);
         return Result.builder(data,

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

@@ -29,7 +29,7 @@ public class BusParamReferController extends PaginationController<BusParamRefer>
 
 
     @ApiOperation(value="修改", notes="修改")
-    @PutMapping("/update")
+    @PostMapping("/update")
     public Result update(@Valid BusParamRefer busParamRefer) {
         PersistModel data = busParamReferServiceImpl.merge(busParamRefer);
         return Result.builder(data);

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

@@ -28,7 +28,7 @@ public class BusProjectAreaController extends PaginationController<BusProjectAre
 
 
     @ApiOperation(value="修改", notes="修改")
-    @PutMapping("/update")
+    @PostMapping("/update")
     public Result update(@RequestBody BusProjectAreaList busProjectAreaList) {
         PersistModel data = busProjectAreaServiceImpl.merge(busProjectAreaList);
         return Result.builder(data);

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

@@ -47,7 +47,7 @@ public class BusProjectController extends PaginationController<BusProject> {
 
 
     @ApiOperation(value="添加项目", notes="添加项目")
-    @PostMapping(value = "/add")
+    @RequestMapping(value = "/add")
     public Result add(@Valid BusProject busProject) {
         PersistModel data = busProjectServiceImpl.save(busProject);
         return Result.builder(data);
@@ -55,14 +55,14 @@ public class BusProjectController extends PaginationController<BusProject> {
 
 
     @ApiOperation(value="修改项目信息", notes="修改项目信息")
-    @PutMapping("/update")
+    @PostMapping("/update")
     public Result update(@Valid BusProject busProject) {
         PersistModel data = busProjectServiceImpl.merge(busProject);
         return Result.builder(data);
     }
 
     @ApiOperation(value="删除项目", notes="删除项目")
-    @DeleteMapping("/delete")
+    @RequestMapping("/delete")
     public Result delete(@RequestParam String proId) {
         BusProject busProject = new BusProject();
         busProject.setProId(proId)  ;
@@ -71,7 +71,7 @@ public class BusProjectController extends PaginationController<BusProject> {
     }
 
     @ApiOperation(value="根据条件查询单个项目信息", notes="根据条件查询单个项目信息")
-    @GetMapping("/detail")
+    @RequestMapping("/detail")
     public Result detail(@Valid BusProject busProject) {
         return Result.builder(new PersistModel(1),
             MessageConstant.MESSAGE_ALERT_SUCCESS,
@@ -80,14 +80,14 @@ public class BusProjectController extends PaginationController<BusProject> {
     }
 
     @ApiOperation(value="查看  集合", notes="查看  集合")
-    @GetMapping(value = "/queryBusProjectByPagination")
+    @RequestMapping(value = "/queryBusProjectByPagination")
     public GridModel listByPagination(BusProject busProject) {
         busProjectServiceImpl.findAllByPagination(getPaginationUtility(), busProject);
         return getGridModelResponse();
     }
 
     @ApiOperation(value="查询用户权限项目", notes="查询用户权限项目")
-    @GetMapping(value = "/queryBusProjectByUser")
+    @RequestMapping(value = "/queryBusProjectByUser")
     public Result queryBusProjectByUser() {
         String userId = UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID);
         Map<String,Object> map = new HashMap<>();

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

@@ -36,7 +36,7 @@ public class BusProjectZoneController {
 
 
     @ApiOperation(value="修改", notes="修改")
-    @PutMapping("/update")
+    @PostMapping("/update")
     public Result update(@Valid BusProjectZone busProjectZone) {
         PersistModel data = busProjectZoneServiceImpl.merge(busProjectZone);
         return Result.builder(data);

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

@@ -13,6 +13,7 @@ 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.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -49,7 +50,7 @@ public class BusSavingController extends PaginationController<BusSaving> {
             @ApiImplicitParam(name = "tm", value = "从业时间", dataType = "字符串"),
             @ApiImplicitParam(name = "performance", value = "项目业绩", dataType = "字符串")
     })
-    @RequestMapping("/update")
+    @PostMapping("/update")
     public Result update(@Valid BusSaving busSaving) {
         Integer result = busSavingServiceImpl.update(busSaving);
         return Result.builder(new PersistModel(result), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR, result);

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

@@ -44,7 +44,7 @@ public class BusTeamController extends PaginationController<BusTeam> {
 
 
     @ApiOperation(value="修改", notes="修改")
-    @PutMapping("/update")
+    @PostMapping("/update")
     public Result update(@Valid BusTeam busTeam) {
         PersistModel data = busTeamServiceImpl.merge(busTeam);
         return Result.builder(data);

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

@@ -29,7 +29,7 @@ public class EnergyPriceController extends PaginationController<EnergyPrice> {
 
 
     @ApiOperation(value="修改", notes="修改")
-    @PutMapping("/update")
+    @PostMapping("/update")
     public Result update(@RequestBody EnergyPriceList energyPriceList) {
         PersistModel data = energyPriceServiceImpl.merge(energyPriceList);
         return Result.builder(data);

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

@@ -33,7 +33,7 @@ public class BusProjectZoneServiceImpl implements BusProjectZoneService {
     public PersistModel merge(BusProjectZone busProjectZone) {
         Integer line = 0;
         String message = "";
-        Example example = new Example(BusFactory.class);
+        Example example = new Example(BusProjectZone.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("bldZoneId",busProjectZone.getBldZoneId());
         if(busProjectZone.getBldZoneId()!=null && !busProjectZone.getBldZoneId().equals("")){

src/main/java/org/rcisoft/business/system/user/controller/UserController.java

@@ -65,6 +65,9 @@ public class UserController  extends PaginationController<SysUser> {
     public Result updateUser(@RequestBody UserDto userDto){
         String userId = UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID);
         SysUser sysUser = userDto.getSysUser();
+        if(userDto.getSysUser().getUserId()!=null){
+            userId = userDto.getSysUser().getUserId();
+        }
         sysUser.setUserId(userId);
         SysAdmins sysAdmins = userDto.getSysAdmins();
         SysOwner sysOwner = userDto.getSysOwner();

src/main/java/org/rcisoft/business/system/user/dao/UserRepository.java

@@ -41,7 +41,7 @@ public interface UserRepository extends BaseMapper<SysUser>{
      * 查询所有用户
      * @return
      */
-    @Select("<script>select a.USER_ID,a.USER_NM,a.USER_TP " +
+    @Select("<script>select a.USER_ID,a.USER_NM,a.USER_NICK_NAME,a.USER_TP " +
             "<if test=\"stable != null\">,b.*</if> " +
             "from sys_user a " +
             "<if test=\"stable != null\">left join ${stable} b on a.USER_ID = b.USER_ID </if> " +

src/main/java/org/rcisoft/business/system/user/service/impl/UserServiceImpl.java

@@ -151,7 +151,7 @@ public class UserServiceImpl implements UserService {
         String userId = sysUser.getUserId();
         String userTp = sysUser.getUserTp();
         try {
-            if (UserTpConstant.TP_ADMIN.equals(userTp)) {
+            if (UserTpConstant.TP_ADMIN.equals(userTp) || UserTpConstant.TP_SUPER_ADMIN.equals(userTp)) {
                 SysAdmins sysAdminsByUserId = adminRepository.getSysAdminsByUserId(userId);
                 if (null != sysAdminsByUserId){
                     sysAdmins.setAdminId(sysAdminsByUserId.getAdminId());

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

@@ -37,11 +37,7 @@ public class MqttClient {
         String devStr = "";
         try {
             JSONObject jb = JSONArray.parseObject(content.substring(1,content.length()-1));
-            Map<String,Object> map = new HashMap<>();
             String jwnum = jb.getString("PHONE");//网关编号
-            map.put("pro_id",jwnum);
-            referMap = totalService.queryBusParamRefer(map);
-            devStr = totalService.queryDevByPro(jwnum);
             String time = jb.getString("TIME");//时间
             JSONObject jbody = jb.getJSONObject("body");//数据体
             //String time = DateUtil.getSimepleDate("yyyyMMddHHmmss",new Date());
@@ -59,6 +55,11 @@ public class MqttClient {
                 }
                 System.out.println("++++++++++++++++++++++++++++++++++"+minute+"-----"+sec);
                 if(Integer.parseInt(minute)%10==0 && sec.equalsIgnoreCase("00")){//10分钟级的数据，进行存储
+                    Map<String,Object> map = new HashMap<>();
+
+                    map.put("pro_id",jwnum);
+                    referMap = totalService.queryBusParamRefer(map);
+                    devStr = totalService.queryDevByPro(jwnum);
                     List<String> list = new ArrayList<String>();
                     List<TotalOriginal> originalList = new ArrayList<>();
                     List<TotalSensor> sensorList = new ArrayList<>();