Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java

@@ -221,6 +221,14 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
                     throw new BadRequest("角色只能增加, 不能删除");
                 }
             }
+            //去掉空角色
+            List<Long> role = userDataZHDto.getRole();
+            if(CollectionUtil.isNotEmpty(role)){
+                if(role.contains(userGroupempty)){
+                    logger.info("移除空角色");
+                    role.remove(userGroupempty);
+                }
+            }
             // 1 修改平台用户
             List<RoleModel> userRoleList = new ArrayList<>();
             AgencyUserModel agencyUserModel = new AgencyUserModel();

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TestController.java

@@ -187,16 +187,31 @@ public class TestController extends BaseController {
 		}
 	}
 
-	@TycloudOperation(ApiLevel = UserType.PUBLIC)
-	@ApiOperation(httpMethod = "GET", value = "test2", notes = "test1", hidden = true)
-	@GetMapping("/insertMomentData")
+	@TycloudOperation(ApiLevel = UserType.PUBLIC, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "insertMomentDataTest", notes = "insertMomentDataTest", hidden = true)
+	@GetMapping("/insertMomentDataTest")
 	public void insertMomentData() {
 		try {
 			Date time = new Date();
 			time = DateUtil.offsetMinute(time, -DateUtil.minute(time) % 10);
 			String format = DateUtil.format(time, "yyyy-MM-dd HH:mm:00");
 			time = DateUtil.parse(format, "yyyy-MM-dd HH:mm:00");
-			tdengineTimeService.insertMomentDataNew(format);
+			tdengineTimeService.insertMomentDataTest("2024-07-25 08:00:00");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@TycloudOperation(ApiLevel = UserType.PUBLIC, needAuth = false)
+	@ApiOperation(httpMethod = "GET", value = "insertMomentDataPvTest", notes = "insertMomentDataPvTest", hidden = true)
+	@GetMapping("/insertMomentDataPvTest")
+	public void insertMomentDataPvTest() {
+		try {
+			Date time = new Date();
+			time = DateUtil.offsetMinute(time, -DateUtil.minute(time) % 10);
+			String format = DateUtil.format(time, "yyyy-MM-dd HH:mm:00");
+			time = DateUtil.parse(format, "yyyy-MM-dd HH:mm:00");
+			tdengineTimeService.insertMomentDataPvTest("2024-07-25 08:00:00");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}