Merge remote-tracking branch 'origin/master'

common/src/main/java/com/huaxu/model/ResultStatus.java

@@ -115,7 +115,8 @@ public enum ResultStatus {
     PARAM_ERROR(700001, "参数缺失"),
     SCENE_TYPE_NAME_ALREADY_EXISTS(900015,"场景类型名称重复"),
     SCENE_NAME_ALREADY_EXISTS(900015,"场景名称重复"),
-    SCENE_PARENT_ALREADY_EXISTS(900016,"上级场景不能选择当前编辑场景")
+    SCENE_PARENT_ALREADY_EXISTS(900016,"上级场景不能选择当前编辑场景"),
+    DEVICE_PARENT_ALREADY_EXISTS(900017,"未选择任何设备或标签信息")
     ;
 
     private final int status;

sms_water/src/main/java/com/huaxu/controller/MonitorInfoController.java

@@ -170,6 +170,16 @@ public class MonitorInfoController {
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @ResponseBody
     public AjaxMessage<Integer> addMonitorInfo(@ApiParam(value = "标签信息", required = true) @RequestBody MonitorInfoEntity monitorInfo) {
+        if (monitorInfo == null) {
+            return new AjaxMessage<>(ResultStatus.DEVICE_PARENT_ALREADY_EXISTS);
+        }
+        LoginUser currentUser = UserUtil.getCurrentUser();
+        monitorInfo.setTenantId(currentUser.getTenantId());
+        monitorInfo.setStatus(1);
+        monitorInfo.setDateCreate(new Date());
+        monitorInfo.setDateUpdate(new Date());
+        monitorInfo.setCreateBy(currentUser.getName());
+        monitorInfo.setUpdateBy(currentUser.getName());
         //校验参数
         int result = monitorInfoService.addMonitorInfo(monitorInfo) ? 1 : 0;
         return new AjaxMessage<>(ResultStatus.OK, result);
@@ -182,6 +192,9 @@ public class MonitorInfoController {
     @ApiOperation(value = "批量新增或修改(按设备)")
     public AjaxMessage<Integer> addMonitorInfo(@ApiParam(value = "标签信息", required = true) @RequestBody ArrayList<MonitorInfoEntity> monitorInfos) {
         LoginUser currentUser = UserUtil.getCurrentUser();
+        if (monitorInfos.size() == 0) {
+            return new AjaxMessage<>(ResultStatus.DEVICE_PARENT_ALREADY_EXISTS);
+        }
         for (MonitorInfoEntity item : monitorInfos) {
             item.setTenantId(currentUser.getTenantId());
             item.setStatus(1);

user_center/src/main/java/com/huaxu/entity/UserEntity.java

@@ -53,6 +53,7 @@ public class UserEntity implements Serializable {
 
     /** 部门 */
     @ApiModelProperty(value = "部门")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Long deptOrgId;
 
     /** 部门名称 */