diff --git a/adc-da-main/pom.xml b/adc-da-main/pom.xml
index bb363e53..df55c43a 100644
--- a/adc-da-main/pom.xml
+++ b/adc-da-main/pom.xml
@@ -60,6 +60,7 @@
spring-cloud-starter-openfeign
2.2.0.RELEASE
+
diff --git a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java
index d583f102..79244a62 100644
--- a/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java
+++ b/adc-da-main/src/main/java/com/adc/da/main/generate/CodeGen.java
@@ -22,11 +22,11 @@ public class CodeGen {
// x.x.x.x:3306/xxxx --MYSQL
// 192.168.10.140:1521:foton_slrs_test
- private static final String DB_IP="101.36.227.22:33050/foton_slrs_test";
+ private static final String DB_IP="192.168.10.47:3306/foton_slrs_test";
private static final String DB_USER="root";
- private static final String DB_PWD="1q2w3e4r";
+ private static final String DB_PWD="root";
/**
diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties
index d89ffe27..88425a41 100644
--- a/adc-da-main/src/main/resources/application-dev.properties
+++ b/adc-da-main/src/main/resources/application-dev.properties
@@ -3,9 +3,9 @@
# 数据库配置
#=============================================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://192.168.10.47:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.url = jdbc:mysql://101.36.227.22:33050/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = root
-spring.datasource.password = root
+spring.datasource.password = 1q2w3e4r
#==============================================
# 应用设置
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java
new file mode 100644
index 00000000..a3e5731d
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java
@@ -0,0 +1,61 @@
+package com.adc.da.slrs.sarInstitution.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService;
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import com.adc.da.slrs.sarUser.service.ITsUserService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+
+/**
+*
+ * 前端控制器
+ *
+*
+* @author zyl
+* @since 2021-06-22
+*/
+@RestController
+@Api(tags = "|机构管理|")
+@RequestMapping("/SarInstitution/institution")
+public class TsInstitutionController extends BaseController {
+ @Autowired
+ private ITsInstitutionService tsInstitutionService;
+ @Autowired
+ private ITsUserService tsUserService;
+
+ /**
+ * 查询所有机构
+ * @return ResponseMessage>
+ */
+ @ApiOperation("查询所有机构")
+ @GetMapping
+ public ResponseMessage> getInstitution(){
+ List institutions=tsInstitutionService.getInstitution();
+ return Result.success(institutions);
+ }
+
+ /**
+ * 查询机构人员
+ * @param institutionId：机构ID
+ * @return ResponseMessage>
+ */
+ @ApiOperation("查询机构的人员")
+ @GetMapping("/user")
+ public ResponseMessage> getUserByInstitutionId(@RequestParam String institutionId){
+ List tsUsers=tsUserService.getUserByInstitutionId(institutionId);
+ return Result.success(tsUsers);
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java
new file mode 100644
index 00000000..f1c9ed26
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java
@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarInstitution.dao;
+
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+public interface TsInstitutionDao extends BaseMapper {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java
new file mode 100644
index 00000000..81976dcf
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/entity/TsInstitution.java
@@ -0,0 +1,46 @@
+package com.adc.da.slrs.sarInstitution.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ *
+ *
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="TsInstitution对象", description="")
+public class TsInstitution extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId("id")
+ private String id;
+
+ @ApiModelProperty(value = "上级机构")
+ private String parentId;
+
+ @ApiModelProperty(value = "机构层级")
+ private Integer level;
+
+ @ApiModelProperty(value = "机构名")
+ private String name;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "子机构")
+ private List children;
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
new file mode 100644
index 00000000..3d2d7460
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
@@ -0,0 +1,24 @@
+package com.adc.da.slrs.sarInstitution.service;
+
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author zxy
+ * @since 2021-06-22
+ */
+public interface ITsInstitutionService extends IService {
+
+ /**
+ * 查询所有机构
+ */
+ List getInstitution();
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
new file mode 100644
index 00000000..4361d532
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
@@ -0,0 +1,61 @@
+package com.adc.da.slrs.sarInstitution.service.impl;
+
+
+import com.adc.da.slrs.sarInstitution.dao.TsInstitutionDao;
+import com.adc.da.slrs.sarInstitution.entity.TsInstitution;
+import com.adc.da.slrs.sarInstitution.service.ITsInstitutionService;
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import com.adc.da.slrs.sarUser.service.ITsUserService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+@Service
+public class TsInstitutionServiceImpl extends ServiceImpl implements ITsInstitutionService {
+ @Autowired
+ private TsInstitutionDao tsInstitutionDao;
+
+ /**
+ * 查询所有机构
+ */
+ @Override
+ public List getInstitution() {
+ //查询第一层机构
+ QueryWrapper institutionQueryWrapper=new QueryWrapper<>();
+ institutionQueryWrapper.eq("level",1);
+ List institutionRoot=tsInstitutionDao.selectList(institutionQueryWrapper);
+ for(TsInstitution tsInstitution:institutionRoot){
+ tsInstitution.setChildren(recursionGetInstitution(tsInstitution));
+ }
+ return institutionRoot;
+ }
+
+
+
+ /**
+ * 递归获取子机构
+ * @param tsInstitution：父机构
+ * @return List
+ */
+ private List recursionGetInstitution(TsInstitution tsInstitution){
+ QueryWrapper institutionQueryWrapper=new QueryWrapper<>();
+ institutionQueryWrapper.eq("parent_id",tsInstitution.getId());
+ institutionQueryWrapper.eq("level",tsInstitution.getLevel()+1);
+ List tsInstitutions=tsInstitutionDao.selectList(institutionQueryWrapper);
+ for(TsInstitution tsInstitutionNode:tsInstitutions){
+ tsInstitutionNode.setChildren(recursionGetInstitution(tsInstitutionNode));
+ }
+ return tsInstitutions;
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/controller/SarUserPersonalMenuController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/controller/SarUserPersonalMenuController.java
new file mode 100644
index 00000000..6e99f43f
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/controller/SarUserPersonalMenuController.java
@@ -0,0 +1,43 @@
+package com.adc.da.slrs.sarPersonalCenter.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserPersonalMenuEO;
+import com.adc.da.slrs.sarPersonalCenter.service.ISarUserPersonalMenuService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserPersonalMenu;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+/**
+*
+ * 前端控制器
+ *
+*
+* @author zyl
+* @since 2021-06-22
+*/
+@RestController
+@Api(tags = "福田标准法规--个人中心--我的板块")
+@RequestMapping("/${restPath}/sarPersonalCenter/sar-user-personal-menu")
+public class SarUserPersonalMenuController extends BaseController {
+
+ @Autowired
+ private ISarUserPersonalMenuService iSarUserPersonalMenuService;
+
+ @ApiOperation("获取用户的板块列表")
+ @GetMapping("/getList")
+ public ResponseMessage> getList(SarUserPersonalMenuEO eo){
+ return iSarUserPersonalMenuService.getUserPersonalMenu(eo);
+ }
+
+ @ApiOperation("更新用户的板块列表")
+ @PostMapping("/update")
+ public ResponseMessage> update(@RequestBody SarUserPersonalMenuEO eo){
+ return iSarUserPersonalMenuService.updateUserPersonalMenu(eo);
+ }
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/controller/SarUserStarController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/controller/SarUserStarController.java
new file mode 100644
index 00000000..a32b041d
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/controller/SarUserStarController.java
@@ -0,0 +1,67 @@
+package com.adc.da.slrs.sarPersonalCenter.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStarEO;
+import com.adc.da.slrs.sarPersonalCenter.service.ISarUserStarService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStar;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.util.Date;
+
+/**
+ *
+ * 前端控制器
+ *
+ *
+ * @author zyl
+ * @since 2021-06-21
+ */
+@RestController
+@Api(tags = "福田标准法规--个人中心--我的收藏")
+@RequestMapping("/${restPath}/sarPersonalCenter/sar-user-star")
+public class SarUserStarController extends BaseController {
+
+ @Autowired
+ private ISarUserStarService iSarUserStarService;
+
+ @ApiOperation("获取用户收藏列表")
+ @GetMapping("/getList")
+ public ResponseMessage> getUserStarList(SarUserStarEO sarUserStarEO) {
+ return iSarUserStarService.getUserStarList(sarUserStarEO);
+ }
+
+ @ApiOperation("批量删除用户收藏")
+ @PostMapping("/deleteList")
+ public ResponseMessage> deleteList(@RequestBody SarUserStarEO sarUserStars) {
+ return iSarUserStarService.deleteList(sarUserStars);
+ }
+
+ @ApiOperation("删除用户收藏")
+ @PostMapping("/delete")
+ public ResponseMessage deleteById(@RequestBody SarUserStarEO sarUserStars) {
+ return iSarUserStarService.deleteById(sarUserStars);
+ }
+
+ @ApiOperation("添加用户收藏")
+ @PostMapping("/addStar")
+ public ResponseMessage addStar(@RequestBody SarUserStar sarUserStar) {
+ return iSarUserStarService.addStar(sarUserStar);
+ }
+
+ @ApiOperation("获取当前用户是否收藏该页面")
+ @GetMapping("/isStar")
+ public ResponseMessage isStar(String userId, String url) {
+ return iSarUserStarService.isStar(userId,url);
+ }
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/dao/SarUserPersonalMenuDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/dao/SarUserPersonalMenuDao.java
new file mode 100644
index 00000000..e11efb48
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/dao/SarUserPersonalMenuDao.java
@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarPersonalCenter.dao;
+
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserPersonalMenu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+public interface SarUserPersonalMenuDao extends BaseMapper {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/dao/SarUserStarDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/dao/SarUserStarDao.java
new file mode 100644
index 00000000..ede9070d
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/dao/SarUserStarDao.java
@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarPersonalCenter.dao;
+
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStar;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author zyl
+ * @since 2021-06-21
+ */
+public interface SarUserStarDao extends BaseMapper {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserPersonalMenu.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserPersonalMenu.java
new file mode 100644
index 00000000..514354c8
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserPersonalMenu.java
@@ -0,0 +1,38 @@
+package com.adc.da.slrs.sarPersonalCenter.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ *
+ *
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarUserPersonalMenu对象", description="")
+public class SarUserPersonalMenu extends BaseEntity {
+
+ @ApiModelProperty("id")
+ private String id;
+
+ private String menuName;
+
+ private String menuId;
+
+ private Integer state;
+
+ private String userId;
+
+ private String menuUrl;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserPersonalMenuEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserPersonalMenuEO.java
new file mode 100644
index 00000000..f456bc5a
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserPersonalMenuEO.java
@@ -0,0 +1,34 @@
+package com.adc.da.slrs.sarPersonalCenter.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ *
+ *
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="SarUserPersonalMenu批量操作对象", description="")
+public class SarUserPersonalMenuEO extends SarUserPersonalMenu {
+
+ @ApiModelProperty("当页数量")
+ private Integer size=20;
+
+ @ApiModelProperty("当前页数")
+ private Integer current=1;
+
+ @ApiModelProperty("操作信息")
+ private List sarUserPersonalMenus;
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserStar.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserStar.java
new file mode 100644
index 00000000..f49bc35e
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserStar.java
@@ -0,0 +1,55 @@
+package com.adc.da.slrs.sarPersonalCenter.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ *
+ *
+ *
+ *
+ * @author zyl
+ * @since 2021-06-21
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel(value="SarUserStar对象", description="")
+public class SarUserStar extends BaseEntity {
+
+ @ApiModelProperty("id")
+ private String id;
+
+ @ApiModelProperty(value = "收藏名")
+ private String name;
+
+ @ApiModelProperty(value = "收藏类型")
+ private String type;
+
+ @ApiModelProperty(value = "收藏具体信息")
+ private String info;
+
+ @ApiModelProperty(value = "用户id")
+ private String userId;
+
+ @ApiModelProperty(value = "所属模块")
+ private String modular;
+
+ @ApiModelProperty(value = "创建时间")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty(value = "该收藏对应的路由")
+ private String url;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserStarEO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserStarEO.java
new file mode 100644
index 00000000..a0c478bc
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/entity/SarUserStarEO.java
@@ -0,0 +1,25 @@
+package com.adc.da.slrs.sarPersonalCenter.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value="SarUserStar批量操作对象", description="")
+public class SarUserStarEO extends SarUserStar{
+
+ @ApiModelProperty("当页数量")
+ private Integer size=20;
+
+ @ApiModelProperty("当前页数")
+ private Integer current=1;
+
+ @ApiModelProperty("操作信息")
+ private List sarUserStars;
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/ISarUserPersonalMenuService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/ISarUserPersonalMenuService.java
new file mode 100644
index 00000000..3ec6ace4
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/ISarUserPersonalMenuService.java
@@ -0,0 +1,29 @@
+package com.adc.da.slrs.sarPersonalCenter.service;
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserPersonalMenu;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserPersonalMenuEO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+public interface ISarUserPersonalMenuService extends IService {
+
+ public ResponseMessage> getUserPersonalMenu(SarUserPersonalMenuEO eo);
+
+ public ResponseMessage> updateUserPersonalMenu(SarUserPersonalMenuEO eo);
+
+ public void updateUserPersonalMenuForRole(List menus,String userId);
+
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/ISarUserStarService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/ISarUserStarService.java
new file mode 100644
index 00000000..0ac178b2
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/ISarUserStarService.java
@@ -0,0 +1,25 @@
+package com.adc.da.slrs.sarPersonalCenter.service;
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStar;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStarEO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author zyl
+ * @since 2021-06-21
+ */
+public interface ISarUserStarService extends IService {
+ public ResponseMessage> getUserStarList(SarUserStarEO sarUserStarEO);
+ public ResponseMessage> deleteList(@RequestBody SarUserStarEO sarUserStars);
+ public ResponseMessage deleteById(@RequestBody SarUserStarEO sarUserStars);
+ public ResponseMessage addStar(@RequestBody SarUserStar sarUserStar);
+ public ResponseMessage isStar(String userId, String url);
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java
new file mode 100644
index 00000000..42b8052d
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserPersonalMenuServiceImpl.java
@@ -0,0 +1,104 @@
+package com.adc.da.slrs.sarPersonalCenter.service.impl;
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserPersonalMenu;
+import com.adc.da.slrs.sarPersonalCenter.dao.SarUserPersonalMenuDao;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserPersonalMenuEO;
+import com.adc.da.slrs.sarPersonalCenter.service.ISarUserPersonalMenuService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+@Service
+public class SarUserPersonalMenuServiceImpl extends ServiceImpl implements ISarUserPersonalMenuService {
+
+
+ @Override
+ public ResponseMessage> getUserPersonalMenu(SarUserPersonalMenuEO eo) {
+ if(eo.getUserId()==null||eo.getUserId().trim().length()==0){
+ return Result.error("userId不能为空");
+ }
+ QueryWrapper queryWrapper=new QueryWrapper<>();
+ queryWrapper.eq("user_id",queryWrapper);
+ if(eo.getMenuUrl()!=null)queryWrapper.eq("menu_url",eo.getMenuUrl());
+ if(eo.getMenuName()!=null&&eo.getMenuName().trim().length()>0)queryWrapper.like("menu_name",eo.getMenuName().trim());
+ if(eo.getState()!=null)queryWrapper.eq("state",eo.getState());
+
+ IPage iPage=new Page<>(eo.getCurrent(),eo.getSize());
+ IPage page = page(iPage, queryWrapper);
+ while (page.getRecords().remove(null));
+ return Result.success(page);
+ }
+
+ @Override
+ public ResponseMessage> updateUserPersonalMenu(SarUserPersonalMenuEO eo) {
+ if(eo.getUserId()==null||eo.getUserId().trim().length()==0){
+ return Result.error("userId不能为空");
+ }
+ List menus=new ArrayList<>();
+ if(eo.getSarUserPersonalMenus()!=null){
+ for (SarUserPersonalMenu menu : eo.getSarUserPersonalMenus()) {
+ if(menu.getId()!=null&&menu.getId().trim().length()>0&&menu.getState()!=null){
+
+ SarUserPersonalMenu sarUserPersonalMenu=new SarUserPersonalMenu();
+ sarUserPersonalMenu.setState(menu.getState()==0?0:1);
+ QueryWrapper queryWrapper=new QueryWrapper<>();
+ queryWrapper.eq("user_id",eo.getUserId());
+ queryWrapper.eq("id",menu.getId());
+
+ update(sarUserPersonalMenu,queryWrapper);
+ }
+ }
+ }
+
+ return getUserPersonalMenu(eo);
+ }
+
+ @Override
+ public void updateUserPersonalMenuForRole(List menuList,String userId) {
+
+ Set ids=new HashSet<>();
+
+ for (SarUserPersonalMenu menu : menuList) {
+ if(menu.getMenuId()!=null&&menu.getMenuId().trim().length()>0){
+
+ QueryWrapper queryWrapper=new QueryWrapper<>();
+ queryWrapper.eq("user_id",userId);
+ queryWrapper.eq("menu_id",menu.getMenuId());
+ List menus = getBaseMapper().selectList(queryWrapper);
+ if (menus.size()>0) {
+ ids.add(menus.get(0).getId());
+ continue;
+ }
+
+ SarUserPersonalMenu sarUserPersonalMenu=new SarUserPersonalMenu();
+ sarUserPersonalMenu.setMenuName(menu.getMenuName());
+ sarUserPersonalMenu.setMenuUrl(menu.getMenuUrl());
+ sarUserPersonalMenu.setUserId(menu.getUserId());
+ sarUserPersonalMenu.setMenuId(menu.getMenuId());
+ sarUserPersonalMenu.setState(0);
+
+ getBaseMapper().insert(sarUserPersonalMenu);
+ ids.add(sarUserPersonalMenu.getId());
+ }
+ }
+ QueryWrapper queryWrapper=new QueryWrapper<>();
+ queryWrapper.notIn("id",ids);
+ queryWrapper.eq("user_id",userId);
+ getBaseMapper().delete(queryWrapper);
+
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java
new file mode 100644
index 00000000..890d219d
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPersonalCenter/service/impl/SarUserStarServiceImpl.java
@@ -0,0 +1,125 @@
+package com.adc.da.slrs.sarPersonalCenter.service.impl;
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStar;
+import com.adc.da.slrs.sarPersonalCenter.dao.SarUserStarDao;
+import com.adc.da.slrs.sarPersonalCenter.entity.SarUserStarEO;
+import com.adc.da.slrs.sarPersonalCenter.service.ISarUserStarService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Date;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zyl
+ * @since 2021-06-21
+ */
+@Service
+public class SarUserStarServiceImpl extends ServiceImpl implements ISarUserStarService {
+
+ @Autowired
+ private ISarUserStarService iSarUserStarService;
+
+ @Override
+ public ResponseMessage> getUserStarList(SarUserStarEO sarUserStarEO) {
+ if (sarUserStarEO.getUserId() == null) {
+ return Result.error("userId不能为空");
+ } else {
+ if (sarUserStarEO.getSize() == null || sarUserStarEO.getSize() <= 0) sarUserStarEO.setSize(20);
+ if (sarUserStarEO.getCurrent() == null || sarUserStarEO.getCurrent() <= 0) sarUserStarEO.setCurrent(1);
+ QueryWrapper wrapper = new QueryWrapper<>();
+ wrapper.eq("user_id", sarUserStarEO.getUserId());
+ if(sarUserStarEO.getType()!=null)wrapper.like("type",sarUserStarEO.getType());
+ if(sarUserStarEO.getName()!=null)wrapper.like("name",sarUserStarEO.getName());
+ if(sarUserStarEO.getModular()!=null)wrapper.like("modular",sarUserStarEO.getModular());
+ if(sarUserStarEO.getInfo()!=null)wrapper.like("info",sarUserStarEO.getInfo());
+ if(sarUserStarEO.getUrl()!=null)wrapper.like("url",sarUserStarEO.getUrl());
+ IPage page = iSarUserStarService.page(new Page<>(sarUserStarEO.getCurrent(), sarUserStarEO.getSize()), wrapper);
+ while (page.getRecords().remove(null)) ;
+ return Result.success(page);
+ }
+ }
+
+
+ @Override
+ public ResponseMessage> deleteList(@RequestBody SarUserStarEO sarUserStars) {
+ if (sarUserStars.getUserId() == null) {
+ return Result.error("userId不能为空");
+ }
+ if (!(sarUserStars.getSarUserStars() == null || sarUserStars.getSarUserStars().size() <= 0)) {
+ for (SarUserStar sarUserStar : sarUserStars.getSarUserStars()) {
+ if (sarUserStar.getId() != null) {
+ QueryWrapper sarUserStarQueryWrapper = new QueryWrapper<>();
+ sarUserStarQueryWrapper.eq("id", sarUserStar.getId());
+ sarUserStarQueryWrapper.eq("user_id", sarUserStars.getUserId());
+ iSarUserStarService.remove(sarUserStarQueryWrapper);
+ }
+ }
+ }
+ return getUserStarList(sarUserStars);
+ }
+
+ @Override
+ public ResponseMessage deleteById(@RequestBody SarUserStarEO sarUserStars) {
+ if (sarUserStars.getUserId() == null) {
+ return Result.error("userId不能为空");
+ }
+ if ((sarUserStars.getId() == null && sarUserStars.getUrl() == null)) {
+ return Result.error("url或id不能为空");
+ }
+ QueryWrapper sarUserStarQueryWrapper = new QueryWrapper<>();
+ if(sarUserStars.getId()!=null)sarUserStarQueryWrapper.eq("id", sarUserStars.getId());
+ else sarUserStarQueryWrapper.eq("url", sarUserStars.getUrl());
+ sarUserStarQueryWrapper.eq("user_id", sarUserStars.getUserId());
+
+
+ return Result.success(iSarUserStarService.remove(sarUserStarQueryWrapper));
+ }
+
+ @Override
+ public ResponseMessage addStar(@RequestBody SarUserStar sarUserStar) {
+ if (sarUserStar.getUserId() == null) {
+ return Result.error("userId不能为空");
+ }
+ if (sarUserStar.getUrl() == null
+ && sarUserStar.getModular() == null
+ && sarUserStar.getName() == null
+ && sarUserStar.getType() == null) {
+ return Result.error("数据有误");
+ }
+
+ sarUserStar.setId(null);
+ sarUserStar.setCreateTime(new Date());
+
+ return Result.success(iSarUserStarService.save(sarUserStar));
+ }
+
+ @Override
+ public ResponseMessage isStar(String userId, String url) {
+ if (userId == null) {
+ return Result.error("userId不能为空");
+ }
+ if (url == null) {
+ return Result.error("url不能为空");
+ }
+
+ QueryWrapper sarUserStarQueryWrapper = new QueryWrapper<>();
+ sarUserStarQueryWrapper.eq("user_id", userId);
+ sarUserStarQueryWrapper.eq("url", url);
+ int count = iSarUserStarService.count(sarUserStarQueryWrapper);
+
+ return Result.success(count > 0);
+ }
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java
new file mode 100644
index 00000000..63ef691b
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java
@@ -0,0 +1,46 @@
+package com.adc.da.slrs.sarRole.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarRole.service.ITsRoleService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarRole.entity.TsRole;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+*
+ * 前端控制器
+ *
+*
+* @author zxy
+* @since 2021-06-22
+*/
+@RestController
+@Api(tags = "|角色管理|")
+@RequestMapping("/sarRole/role")
+public class TsRoleController extends BaseController {
+ @Autowired
+ private ITsRoleService tsRoleService;
+
+ @ApiOperation("查询所有角色")
+ @GetMapping
+ public ResponseMessage> getAll(){
+ List tsRoles=tsRoleService.getAll();
+ return Result.success(tsRoles);
+ }
+
+ @ApiOperation("根据角色名筛选角色")
+ @GetMapping("/name")
+ public ResponseMessage> getByName(String name){
+ List tsRoles=tsRoleService.getByName(name);
+ return Result.success(tsRoles);
+ }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java
new file mode 100644
index 00000000..51bc80e2
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java
@@ -0,0 +1,16 @@
+package com.adc.da.slrs.sarRole.dao;
+
+import com.adc.da.slrs.sarRole.entity.TsRole;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+public interface TsRoleDao extends BaseMapper {
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java
new file mode 100644
index 00000000..c57db19f
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java
@@ -0,0 +1,113 @@
+package com.adc.da.slrs.sarRole.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ *
+ *
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="TsRole对象", description="")
+public class TsRole extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "主键")
+ @TableId("ID")
+ private String id;
+
+ @ApiModelProperty(value = "角色名称")
+ @TableField("NAME")
+ private String name;
+
+ @ApiModelProperty(value = "角色类型")
+ @TableField("ROLE_TYPE")
+ private String roleType;
+
+ @ApiModelProperty(value = "角色状态")
+ @TableField("USE_FLAG")
+ private BigDecimal useFlag;
+
+ @ApiModelProperty(value = "是否默认")
+ @TableField("IS_DEFAULT")
+ private BigDecimal isDefault;
+
+ @ApiModelProperty(value = "角色描述")
+ @TableField("REMARKS")
+ private String remarks;
+
+ @ApiModelProperty(value = "操作时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Timestamp operateTime;
+
+ @ApiModelProperty(value = "操作人")
+ private String operator;
+
+ @ApiModelProperty(value = "备注")
+ @TableField("EXT_INFO")
+ private String extInfo;
+
+ @TableField("OPER_USER")
+ private String operUser;
+
+ @ApiModelProperty(value = "是否有效")
+ @TableField("VALID_FLAG")
+ private BigDecimal validFlag;
+
+ @ApiModelProperty(value = "创建时间")
+ @TableField("CREATION_TIME")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Timestamp creationTime;
+
+ @ApiModelProperty(value = "修改时间")
+ @TableField("MODIFY_TIME")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Timestamp modifyTime;
+
+ @ApiModelProperty(value = "上级节点id")
+ @TableField("PARENT_ID")
+ private String parentId;
+
+ @ApiModelProperty(value = "角色层级")
+ @TableField("role_level")
+ private Integer roleLevel;
+
+ @ApiModelProperty(value = "对应部门id")
+ @TableField("DY_ORG_ID")
+ private String dyOrgId;
+
+ @ApiModelProperty(value = "对应部门名称")
+ @TableField("DY_ORG_NAME")
+ private String dyOrgName;
+
+ @ApiModelProperty(value = "子角色")
+ @TableField(exist = false)
+ private List children;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java
new file mode 100644
index 00000000..f8405e9a
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java
@@ -0,0 +1,30 @@
+package com.adc.da.slrs.sarRole.service;
+
+import com.adc.da.slrs.sarRole.entity.TsRole;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+public interface ITsRoleService extends IService {
+
+ /**
+ * 查询所有角色
+ * @return List
+ */
+ List getAll();
+
+ /**
+ * 通过名字查询角色
+ * @param name：角色名
+ * @return List
+ */
+ List getByName(String name);
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java
new file mode 100644
index 00000000..ae5c052a
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java
@@ -0,0 +1,70 @@
+package com.adc.da.slrs.sarRole.service.impl;
+
+import com.adc.da.slrs.sarRole.entity.TsRole;
+import com.adc.da.slrs.sarRole.dao.TsRoleDao;
+import com.adc.da.slrs.sarRole.service.ITsRoleService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author zyl
+ * @since 2021-06-22
+ */
+@Service
+public class TsRoleServiceImpl extends ServiceImpl implements ITsRoleService {
+ @Autowired
+ private TsRoleDao tsRoleDao;
+
+ /**
+ * 查询所有角色
+ * @return List
+ */
+ @Override
+ public List getAll() {
+ QueryWrapper tsRoleQueryWrapper=new QueryWrapper<>();
+ tsRoleQueryWrapper.eq("role_level",1);
+ List rootRole=tsRoleDao.selectList(tsRoleQueryWrapper);
+ for(TsRole tsRole:rootRole){
+ tsRole.setChildren(recursionGetRole(tsRole));
+ }
+ return rootRole;
+ }
+
+ /**
+ * 递归查询子角色
+ * @param tsRole：父角色
+ * @return List
+ */
+ private List recursionGetRole(TsRole tsRole){
+ QueryWrapper tsRoleQueryWrapper=new QueryWrapper<>();
+ tsRoleQueryWrapper.eq("parent_id",tsRole.getId());
+ tsRoleQueryWrapper.eq("role_level",tsRole.getRoleLevel()+1);
+ List tsRoles=tsRoleDao.selectList(tsRoleQueryWrapper);
+ for(TsRole tsRoleNode:tsRoles){
+ tsRoleNode.setChildren(recursionGetRole(tsRoleNode));
+ }
+ return tsRoles;
+ }
+
+ /**
+ * 通过名字查询角色
+ * @param name：角色名
+ * @return List
+ */
+ @Override
+ public List getByName(String name) {
+ QueryWrapper tsRoleQueryWrapper=new QueryWrapper<>();
+ tsRoleQueryWrapper.like("name","%"+name+"%");
+ return tsRoleDao.selectList(tsRoleQueryWrapper);
+ }
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
index e457319a..bfa7a494 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
@@ -41,11 +41,12 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
+ if(sarStandUnqualifiedPage.getStandId()!=null){
+ sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"));
+// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
+ }
//仅查询未关闭的
sarStandUnqualifiedQueryWrapper.eq("close_state",1);
- if(sarStandUnqualifiedPage.getStandId()!=null){
- sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
- }
if(sarStandUnqualifiedPage.getProductName()!=null){
sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%");
}
@@ -68,11 +69,13 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl getSarStandUnqualifiedHistoryPage(SarStandUnqualifiedPage sarStandUnqualifiedPage) {
QueryWrapper sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
+ if(sarStandUnqualifiedPage.getStandId()!=null){
+ sarStandUnqualifiedQueryWrapper.and(wrapper->wrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%"));
+// sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
+ }
+
//仅查询关闭的
sarStandUnqualifiedQueryWrapper.eq("close_state",2);
- if(sarStandUnqualifiedPage.getStandId()!=null){
- sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
- }
if(sarStandUnqualifiedPage.getProductName()!=null){
sarStandUnqualifiedQueryWrapper.like("product_name","%"+sarStandUnqualifiedPage.getProductName()+"%");
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationForeignStandardController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationForeignStandardController.java
index 2df7a33d..74662767 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationForeignStandardController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarInterpretationForeignStandardController.java
@@ -20,4 +20,5 @@ import com.adc.da.base.web.BaseController;
@RequestMapping("/sarStandardComplianceAssessResult/sar-interpretation-foreign-standard")
public class SarInterpretationForeignStandardController extends BaseController {
+
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
index 43ba106f..b637499d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
@@ -61,7 +61,11 @@ public class SarStandardComplianceAssessResultController {
if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
}
- return Result.success(iSarStandardComplianceProductAssessService.page(iPage,queryWrapper));
+ IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper);
+
+ while(page.getRecords().remove(null));
+
+ return Result.success(page);
}else {
if(eo.getPosition()==1){
QueryWrapper queryWrapper = new QueryWrapper<>();
@@ -73,7 +77,10 @@ public class SarStandardComplianceAssessResultController {
if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
}
- return Result.success(iSarInterpretationNationalStandardService.page(iPage,queryWrapper));
+ IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper);
+ while(page.getRecords().remove(null));
+
+ return Result.success(page);
}else{
QueryWrapper queryWrapper = new QueryWrapper<>();
IPage iPage = new Page<>(eo.getCurrent(), eo.getSize());
@@ -84,7 +91,10 @@ public class SarStandardComplianceAssessResultController {
if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
}
- return Result.success(iSarInterpretationForeignStandardService.page(iPage,queryWrapper));
+
+ IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper);
+ while(page.getRecords().remove(null));
+ return Result.success(page);
}
}
}
@@ -96,7 +106,12 @@ public class SarStandardComplianceAssessResultController {
if (eo.getProductName() != null) queryWrapper.like("product_name", eo.getProductName());
if (eo.getStandId() != null) queryWrapper.like("STAND_ID", eo.getStandId());
if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
- return Result.success(iSarStandardComplianceProductAssessService.page(iPage, queryWrapper));
+
+ IPage page = iSarStandardComplianceProductAssessService.page(iPage, queryWrapper);
+
+ while(page.getRecords().remove(null));
+
+ return Result.success(page);
}
@ApiOperation(value = "条件查询技术审核符合性清单")
@@ -107,13 +122,19 @@ public class SarStandardComplianceAssessResultController {
QueryWrapper queryWrapper = new QueryWrapper<>();
if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
if(eo.getStandId()!=null)queryWrapper.eq("STAND_ID",eo.getStandId());
- return Result.success(iSarInterpretationNationalStandardService.page(iPage, queryWrapper));
+
+ IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper);
+ while(page.getRecords().remove(null));
+ return Result.success(page);
} else {
IPage iPage = new Page<>(eo.getCurrent(), eo.getSize());
QueryWrapper queryWrapper = new QueryWrapper<>();
if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime());
if(eo.getStandId()!=null)queryWrapper.eq("STAND_ID",eo.getStandId());
- return Result.success(iSarInterpretationForeignStandardService.page(iPage, queryWrapper));
+ IPage page = iSarInterpretationForeignStandardService.page(iPage, queryWrapper);
+ while(page.getRecords().remove(null));
+
+ return Result.success(page);
}
}
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java
new file mode 100644
index 00000000..a3efd94a
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/controller/TsUserController.java
@@ -0,0 +1,43 @@
+package com.adc.da.slrs.sarUser.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.sarUser.service.ITsUserService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.adc.da.slrs.sarUser.entity.TsUser;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+*
+ * 前端控制器
+ *
+*
+* @author zxy
+* @since 2021-06-22
+*/
+@RestController
+@Api(tags = "|人员管理|")
+@RequestMapping("/sarUser/user")
+public class TsUserController extends BaseController {
+ @Autowired
+ private ITsUserService tsUserService;
+
+ @ApiOperation("禁用/解禁人员")
+ @PostMapping("/disable")
+ public ResponseMessage