:lock: 密码置空；

:zap: t_alarm_clean改主键。

src/main/java/com/szwl/controller/DemoController.java

@@ -44,10 +44,11 @@ public class DemoController {
     public ResponseModel<?> queryByXml(TAdminParam param) {
         return R.ok(tAdminService.listByXml(param));
     }
+
     @GetMapping("/pageByXml")
     public ResponseModel<?> pageByXml(TAdminParam param) {
         Page page = new Page<>(param.getCurrent(), param.getSize());
-        return R.ok(tAdminService.pageByXml(page,param));
+        return R.ok(tAdminService.pageByXml(page, param));
     }
 
     @ApiOperation(value = "测试获取用户")
@@ -56,15 +57,17 @@ public class DemoController {
         TAdmin tAdmin = tAdminService.getById(id);
         return R.ok(tAdmin);
     }
+
     @ApiOperation(value = "测试审计日志功能")
     @GetMapping("/testAuditLog")
-    @Audit(type = AuditEnum.QUERY,bizNo = "#returnObj.data.num",
+    @Audit(type = AuditEnum.QUERY, bizNo = "#returnObj.data.num",
             content = "#loginUser.userRealName + '调用 测试审计日志功能'")
     public ResponseModel<?> testAuditLog() {
         Map reslut = new HashedMap();
-        reslut.put("num","111");
+        reslut.put("num", "111");
         return R.ok(reslut);
     }
+
     @ApiOperation(value = "调用feign")
     @GetMapping("/testFeign")
     public ResponseModel<?> testPage(String id) {
@@ -85,13 +88,15 @@ public class DemoController {
     @GetMapping("/testPage")
     public ResponseModel<IPage<?>> testPage(TAdminParam param) {
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
-        query.eq(TAdmin::getIsEnabled,true);
-        if(StrUtil.isNotBlank(param.getName())){
-            query.like(TAdmin::getName,param.getName());
+        query.eq(TAdmin::getIsEnabled, true);
+        if (StrUtil.isNotBlank(param.getName())) {
+            query.like(TAdmin::getName, param.getName());
         }
         query.orderByDesc(TAdmin::getApplyStartTime);
         Page<TAdmin> page = new Page<>(param.getCurrent(), param.getSize(), true);
         IPage<TAdmin> iPage = tAdminService.page(page, query);
+        // 密码置空
+        iPage.getRecords().stream().forEach(e -> e.setPassword(""));
         return R.ok(iPage);
     }
 
@@ -99,21 +104,22 @@ public class DemoController {
     @GetMapping("/testList")
     public ResponseModel<List<?>> testList(TAdminParam param) {
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
-        query.eq(TAdmin::getIsEnabled,true);
-        if(StrUtil.isNotBlank(param.getName())){
-            query.like(TAdmin::getName,param.getName());
+        query.eq(TAdmin::getIsEnabled, true);
+        if (StrUtil.isNotBlank(param.getName())) {
+            query.like(TAdmin::getName, param.getName());
         }
         query.orderByDesc(TAdmin::getApplyStartTime);
         List<TAdmin> list = tAdminService.list(query);
         return R.ok(list);
     }
+
     @ApiOperation(value = "返回失败")
     @GetMapping("/testError")
     public ResponseModel<List<?>> testError(boolean success) {
-        if(success){
+        if (success) {
             return R.ok();
-        }else{
-            return R.fail(ResponseCodesEnum.B0001,"你的错误信息");
+        } else {
+            return R.fail(ResponseCodesEnum.B0001, "你的错误信息");
         }
     }
 }

src/main/java/com/szwl/controller/TAdminController.java

@@ -766,6 +766,7 @@ public class TAdminController {
         query.orderByDesc(TAdmin::getCreateDate);
         Page<TAdmin> page = new Page<>(current, size, true);
         IPage<TAdmin> iPage = tAdminService.page(page, query);
+        iPage.getRecords().stream().forEach(e->e.setPassword(""));  // 密码置空
         return R.ok(iPage);
     }
 
@@ -776,6 +777,7 @@ public class TAdminController {
         LambdaQueryWrapper<TAdmin> query = Wrappers.lambdaQuery();
         Page<TAdmin> page = new Page<>(current, size, true);
         IPage<TAdmin> iPage = tAdminService.page(page, query);
+        iPage.getRecords().stream().forEach(e->e.setPassword(""));
         return R.ok(iPage);
     }
 

src/main/java/com/szwl/mapper/xml/TAlarmCleanMapper.xml

@@ -4,10 +4,10 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.szwl.model.entity.TAlarmClean">
-        <id column="id" property="id" />
+        <id column="client_id" property="clientId" />
+        <result column="id" property="id" />
         <result column="admin_id" property="adminId" />
         <result column="equipment_id" property="equipmentId" />
-        <result column="client_id" property="clientId" />
         <result column="is_oversea" property="isOversea" />
         <result column="phone" property="phone" />
         <result column="email" property="email" />

src/main/java/com/szwl/model/entity/TAlarmClean.java

@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2024-04-26
+ * @since 2024-06-20
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -24,7 +24,7 @@ public class TAlarmClean implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
+//    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private Long id;
 
     @ApiModelProperty(value = "用户id")
@@ -34,6 +34,7 @@ public class TAlarmClean implements Serializable {
     private Long equipmentId;
 
     @ApiModelProperty(value = "设备编号")
+    @TableId(value = "client_id", type = IdType.ASSIGN_ID)
     private String clientId;
 
     @ApiModelProperty(value = "是否海外：0否，1是")