整合dm完成

pom.xml

@@ -17,7 +17,6 @@
     <modules>
         <module>usky-module-demo</module>
     <module>service-backend</module>
-    <module>service-system</module>
     <module>service-dm</module>
   </modules>
 

service-dm/service-dm-biz/pom.xml

@@ -27,6 +27,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>usky-common-tenant</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
 
     </dependencies>
 

service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/BaCwInfoController.java

@@ -28,14 +28,14 @@ public class BaCwInfoController {
 
     @Autowired
     private BaCwInfoService baCwInfoService;
-
-
-
-    @GetMapping("addByConfig")
-    public ApiResult<Void> addByConfig(){
-        baCwInfoService.addByConfig();
-        return ApiResult.success();
-    }
+//
+//
+//
+//    @GetMapping("addByConfig")
+//    public ApiResult<Void> addByConfig(){
+//        baCwInfoService.addByConfig();
+//        return ApiResult.success();
+//    }
 
     /**
      * 分页

service-dm/service-dm-biz/src/main/java/com/usky/dm/controller/web/TestController.java

@@ -0,0 +1,68 @@
+package com.usky.dm.controller.web;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.dm.domain.Test;
+import com.usky.dm.service.TestService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2022-08-08
+ */
+@RestController
+@RequestMapping("/test")
+public class TestController {
+
+
+    @Autowired
+    private TestService testService;
+
+
+    /**
+     * 分页
+     */
+    @GetMapping("/page")
+    public ApiResult<CommonPage<Test>> page(){
+        Page<Test> page = new Page<>(1, 10);
+        LambdaQueryWrapper<Test> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(Test::getNameValue,1);
+        page = testService.page(page,queryWrapper);
+        return ApiResult.success(new CommonPage<>(page.getRecords(), page.getTotal(), page.getSize(), page.getCurrent()));
+    }
+
+    /**
+     * list
+     * @return
+     */
+    @GetMapping("/list")
+    public ApiResult<List<Test>> list(){
+        LambdaQueryWrapper<Test> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(Test::getNameValue,1);
+        return ApiResult.success(testService.list(queryWrapper));
+    }
+
+    /**
+     * list mapper
+     * @return
+     */
+    @GetMapping("/listMapper")
+    public ApiResult<List<Test>> listMapper(){
+        return ApiResult.success(testService.listMapper());
+    }
+
+}
+

service-dm/service-dm-biz/src/main/java/com/usky/dm/domain/Test.java

@@ -1,16 +1,17 @@
 package com.usky.dm.domain;
 
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
  * </p>
  *
  * @author ya
- * @since 2022-07-21
+ * @since 2022-08-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -18,7 +19,14 @@ public class Test implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    private Long id;
+
     private String nameValue;
 
+    /**
+     * 租户编号
+     */
+    private Integer tenantId;
+
 
 }

service-dm/service-dm-biz/src/main/java/com/usky/dm/mapper/TestMapper.java

@@ -0,0 +1,23 @@
+package com.usky.dm.mapper;
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.dm.domain.Test;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-08-08
+ */
+@Repository
+public interface TestMapper extends CrudMapper<Test> {
+
+
+    public List<Test> all(@Param("name") String name);
+}

service-dm/service-dm-biz/src/main/java/com/usky/dm/service/BaCwInfoService.java

@@ -20,7 +20,7 @@ import java.util.List;
  */
 public interface BaCwInfoService extends CrudService<BaCwInfo> {
 
-    void addByConfig();
+//    void addByConfig();
 
     CommonPage<BaCwInfo> list(Integer current, Integer size, Date startTime, Date endTime, String status, String floor,
                               String type, Boolean isAlert, String name);

service-dm/service-dm-biz/src/main/java/com/usky/dm/service/TestService.java

@@ -0,0 +1,21 @@
+package com.usky.dm.service;
+
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.dm.domain.Test;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-08-08
+ */
+public interface TestService extends CrudService<Test> {
+
+
+    public List<Test> listMapper();
+}

service-dm/service-dm-biz/src/main/java/com/usky/dm/service/impl/BaCwInfoServiceImpl.java

@@ -22,7 +22,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -42,36 +41,36 @@ public class BaCwInfoServiceImpl extends AbstractCrudService<BaCwInfoMapper, BaC
     private WorkOrderService workOrderService;
 
 
-    @Autowired
-    private SysConfigMapper sysConfigMapper;
-
-    @Override
-    public void addByConfig() {
-        List<BaCwInfo> addList = new ArrayList<>();
-        LambdaQueryWrapper<BaCwInfo> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select(BaCwInfo::getDeviceName);
-        List<BaCwInfo> baCwInfoList = this.list(queryWrapper);
-        SysConfig config = new SysConfig();
-        config.setConfigKey("ba.wc.mapping");
-        SysConfig sysConfig = sysConfigMapper.selectConfig(config);
-        BaCwVO baCwVO = JsonUtils.fromJson(sysConfig.getConfigValue(), BaCwVO.class);
-        for (BaCwFloorVO baCwFloorVO:baCwVO.getWClist()) {
-            for (BaCwDetailVO baCwDetailVO:baCwFloorVO.getCwlist()) {
-                boolean present = baCwInfoList.stream()
-                        .anyMatch(baCwInfo -> baCwInfo.getDeviceName().equals(baCwDetailVO.getCode()));
-                if (!present && StringUtils.isNotBlank(baCwDetailVO.getCode())){
-                    BaCwInfo baCwInfo = new BaCwInfo();
-                    baCwInfo.setDeviceName(baCwDetailVO.getCode());
-                    baCwInfo.setWcType(baCwFloorVO.getType());
-                    baCwInfo.setFloor(baCwFloorVO.getFloor().toString());
-                    baCwInfo.setWcCode(baCwDetailVO.getId());
-                    baCwInfo.setStatus("0");
-                    addList.add(baCwInfo);
-                }
-            }
-        }
-        this.saveBatch(addList);
-    }
+//    @Autowired
+//    private SysConfigMapper sysConfigMapper;
+//
+//    @Override
+//    public void addByConfig() {
+//        List<BaCwInfo> addList = new ArrayList<>();
+//        LambdaQueryWrapper<BaCwInfo> queryWrapper = Wrappers.lambdaQuery();
+//        queryWrapper.select(BaCwInfo::getDeviceName);
+//        List<BaCwInfo> baCwInfoList = this.list(queryWrapper);
+//        SysConfig config = new SysConfig();
+//        config.setConfigKey("ba.wc.mapping");
+//        SysConfig sysConfig = sysConfigMapper.selectConfig(config);
+//        BaCwVO baCwVO = JsonUtils.fromJson(sysConfig.getConfigValue(), BaCwVO.class);
+//        for (BaCwFloorVO baCwFloorVO:baCwVO.getWClist()) {
+//            for (BaCwDetailVO baCwDetailVO:baCwFloorVO.getCwlist()) {
+//                boolean present = baCwInfoList.stream()
+//                        .anyMatch(baCwInfo -> baCwInfo.getDeviceName().equals(baCwDetailVO.getCode()));
+//                if (!present && StringUtils.isNotBlank(baCwDetailVO.getCode())){
+//                    BaCwInfo baCwInfo = new BaCwInfo();
+//                    baCwInfo.setDeviceName(baCwDetailVO.getCode());
+//                    baCwInfo.setWcType(baCwFloorVO.getType());
+//                    baCwInfo.setFloor(baCwFloorVO.getFloor().toString());
+//                    baCwInfo.setWcCode(baCwDetailVO.getId());
+//                    baCwInfo.setStatus("0");
+//                    addList.add(baCwInfo);
+//                }
+//            }
+//        }
+//        this.saveBatch(addList);
+//    }
 
     @Override
     public CommonPage<BaCwInfo> list(Integer current, Integer size, Date startTime, Date endTime,String status,String floor,

service-dm/service-dm-biz/src/main/java/com/usky/dm/service/impl/TestServiceImpl.java

@@ -0,0 +1,26 @@
+package com.usky.dm.service.impl;
+
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.dm.domain.Test;
+import com.usky.dm.mapper.TestMapper;
+import com.usky.dm.service.TestService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2022-08-08
+ */
+@Service
+public class TestServiceImpl extends AbstractCrudService<TestMapper, Test> implements TestService {
+
+    @Override
+    public List<Test> listMapper() {
+        return baseMapper.all("1");
+    }
+}

service-dm/service-dm-biz/src/main/resources/mapper.dm/BaAhuInfoMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/BaAhuInfoMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.BaAhuInfoMapper">
+<mapper namespace="com.usky.dm.mapper.BaAhuInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.BaAhuInfo">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.BaAhuInfo">
         <id column="id" property="id" />
         <result column="rs" property="rs" />
         <result column="al" property="al" />

service-dm/service-dm-biz/src/main/resources/mapper.dm/BaCwInfoMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/BaCwInfoMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.BaCwInfoMapper">
+<mapper namespace="com.usky.dm.mapper.BaCwInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.BaCwInfo">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.BaCwInfo">
         <id column="id" property="id" />
         <result column="device_name" property="deviceName" />
         <result column="create_time" property="createTime" />

service-dm/service-dm-biz/src/main/resources/mapper.dm/BaJsjInfoMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/BaJsjInfoMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.BaJsjInfoMapper">
+<mapper namespace="com.usky.dm.mapper.BaJsjInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.BaJsjInfo">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.BaJsjInfo">
         <id column="id" property="id" />
         <result column="device_name" property="deviceName" />
         <result column="b1rs" property="b1rs" />

service-dm/service-dm-biz/src/main/resources/mapper.dm/BaPauInfoMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/BaPauInfoMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.BaPauInfoMapper">
+<mapper namespace="com.usky.dm.mapper.BaPauInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.BaPauInfo">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.BaPauInfo">
         <id column="id" property="id" />
         <result column="device_name" property="deviceName" />
         <result column="rs" property="rs" />

service-dm/service-dm-biz/src/main/resources/mapper.dm/BuildingMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/BuildingMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.BuildingMapper">
+<mapper namespace="com.usky.dm.mapper.BuildingMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.Building">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.Building">
         <id column="id" property="id" />
         <result column="build_name" property="buildName" />
         <result column="posistion" property="posistion" />

service-dm/service-dm-biz/src/main/resources/mapper.dm/CommunicationApiMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/CommunicationApiMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.CommunicationApiMapper">
+<mapper namespace="com.usky.dm.mapper.CommunicationApiMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.CommunicationApi">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.CommunicationApi">
         <id column="id" property="id" />
         <result column="interface_name" property="interfaceName" />
         <result column="interface_route" property="interfaceRoute" />

service-dm/service-dm-biz/src/main/resources/mapper.dm/CompanyMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/CompanyMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.CompanyMapper">
+<mapper namespace="com.usky.dm.mapper.CompanyMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.Company">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.Company">
         <id column="id" property="id" />
         <result column="owner_id" property="ownerId" />
         <result column="owner_name" property="ownerName" />

service-dm/service-dm-biz/src/main/resources/mapper.dm/DeviceChannelMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/DeviceChannelMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.DeviceChannelMapper">
+<mapper namespace="com.usky.dm.mapper.DeviceChannelMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.DeviceChannel">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.DeviceChannel">
         <id column="id" property="id" />
         <result column="device_code" property="deviceCode" />
         <result column="passageway_name" property="passagewayName" />
@@ -14,7 +14,7 @@
         <result column="add_people" property="addPeople" />
         <result column="add_time" property="addTime" />
     </resultMap>
-    <select id="page" resultType="com.usky.dm.model.DeviceChannel">
+    <select id="page" resultType="com.usky.dm.domain.DeviceChannel">
         select f.*,cp.owner_name as companyName
         from device_channel as f
         inner join company as cp

service-dm/service-dm-biz/src/main/resources/mapper.dm/DeviceMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/DeviceMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.DeviceMapper">
+<mapper namespace="com.usky.dm.mapper.DeviceMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.Device">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.Device">
         <id column="id" property="id" />
         <result column="owner_code" property="ownerCode" />
         <result column="owner_name" property="ownerName" />
@@ -36,14 +36,14 @@
         <result column="login_param" property="loginParam" />
         <result column="transfer_type" property="transferType" />
     </resultMap>
-    <select id="getCollect" resultType="com.usky.dm.persistence.mapper.vo.DeviceCollectVO">
+    <select id="getCollect" resultType="com.usky.dm.mapper.vo.DeviceCollectVO">
         select d.dwtype as deviceType,ds.devicestatus as deviceStatus,count(*) deviceCount
         from device as d
         inner join device_status as ds
         on d.owner_code = ds.deviceid
         group by d.dwtype,ds.devicestatus
     </select>
-    <select id="list" resultType="com.usky.dm.model.Device">
+    <select id="list" resultType="com.usky.dm.domain.Device">
         select d.*,ds.devicestatus as deviceStatus,ds.statustime as statustime,dt.type_name as deviceType,cp.owner_name as companyName,bu.build_name as buildingName
         from device as d
         inner join device_status as ds

service-dm/service-dm-biz/src/main/resources/mapper.dm/DeviceStatusMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/DeviceStatusMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.DeviceStatusMapper">
+<mapper namespace="com.usky.dm.mapper.DeviceStatusMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.DeviceStatus">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.DeviceStatus">
         <id column="id" property="id" />
         <result column="deviceid" property="deviceid" />
         <result column="deviceno" property="deviceno" />

service-dm/service-dm-biz/src/main/resources/mapper.dm/DeviceTypeMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/DeviceTypeMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.DeviceTypeMapper">
+<mapper namespace="com.usky.dm.mapper.DeviceTypeMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.DeviceType">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.DeviceType">
         <id column="id" property="id" />
         <result column="type_name" property="typeName" />
         <result column="type_value" property="typeValue" />
@@ -14,7 +14,7 @@
         <result column="add_people" property="addPeople" />
         <result column="add_time" property="addTime" />
     </resultMap>
-    <select id="page" resultType="com.usky.dm.model.DeviceType">
+    <select id="page" resultType="com.usky.dm.domain.DeviceType">
         select dt.*,cp.owner_name as companyName
         from device_type as dt
         inner join company as cp

service-dm/service-dm-biz/src/main/resources/mapper.dm/DevopsTeamMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/DevopsTeamMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.DevopsTeamMapper">
+<mapper namespace="com.usky.dm.mapper.DevopsTeamMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.DevopsTeam">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.DevopsTeam">
         <id column="id" property="id" />
         <result column="team_name" property="teamName" />
         <result column="e_state" property="eState" />
@@ -11,7 +11,7 @@
         <result column="add_people" property="addPeople" />
         <result column="add_time" property="addTime" />
     </resultMap>
-    <select id="page" resultType="com.usky.dm.model.DevopsTeam">
+    <select id="page" resultType="com.usky.dm.domain.DevopsTeam">
         select dt.*,cp.owner_name as companyName,dtr.name as dutyName,dtr.phone as dutyPhone
         from devops_team as dt
         inner join company as cp

service-dm/service-dm-biz/src/main/resources/mapper.dm/DevopsTeamRelationMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/DevopsTeamRelationMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.DevopsTeamRelationMapper">
+<mapper namespace="com.usky.dm.mapper.DevopsTeamRelationMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.DevopsTeamRelation">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.DevopsTeamRelation">
         <id column="id" property="id" />
         <result column="fid" property="fid" />
         <result column="name" property="name" />

service-dm/service-dm-biz/src/main/resources/mapper.dm/EventManageMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/EventManageMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.EventManageMapper">
+<mapper namespace="com.usky.dm.mapper.EventManageMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.EventManage">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.EventManage">
         <id column="id" property="id" />
         <result column="event_name" property="eventName" />
         <result column="event_type" property="eventType" />
@@ -15,7 +15,7 @@
         <result column="cl_tiem" property="clTiem" />
         <result column="company_code" property="companyCode" />
     </resultMap>
-    <select id="page" resultType="com.usky.dm.model.EventManage">
+    <select id="page" resultType="com.usky.dm.domain.EventManage">
         select em.*,c.owner_name as companyName
         from event_manage as em
         inner join company as c

service-dm/service-dm-biz/src/main/resources/mapper.dm/FacilityMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/FacilityMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.FacilityMapper">
+<mapper namespace="com.usky.dm.mapper.FacilityMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.Facility">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.Facility">
         <id column="id" property="id" />
         <result column="facility_no" property="facilityNo" />
         <result column="facility_name" property="facilityName" />
@@ -30,7 +30,7 @@
         <result column="status" property="status" />
         <result column="qrurl" property="qrurl" />
     </resultMap>
-    <select id="page" resultType="com.usky.dm.model.Facility">
+    <select id="page" resultType="com.usky.dm.domain.Facility">
         select f.*,cp.owner_name as companyName
         from facility as f
         inner join company as cp

service-dm/service-dm-biz/src/main/resources/mapper.dm/FloorMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/FloorMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.FloorMapper">
+<mapper namespace="com.usky.dm.mapper.FloorMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.Floor">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.Floor">
         <id column="id" property="id" />
         <result column="floor_id" property="floorId" />
         <result column="build_id" property="buildId" />
@@ -13,7 +13,7 @@
         <result column="creat_man" property="creatMan" />
         <result column="status" property="status" />
     </resultMap>
-    <select id="page" resultType="com.usky.dm.model.Floor">
+    <select id="page" resultType="com.usky.dm.domain.Floor">
         select f.*,b.build_name as buildName
         from floor as f
         inner join building as b

service-dm/service-dm-biz/src/main/resources/mapper.dm/InspectionPointMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/InspectionPointMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.InspectionPointMapper">
+<mapper namespace="com.usky.dm.mapper.InspectionPointMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.InspectionPoint">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.InspectionPoint">
         <id column="id" property="id" />
         <result column="spot_name" property="spotName" />
         <result column="spot_address" property="spotAddress" />
@@ -19,7 +19,7 @@
         <result column="spot_type" property="spotType" />
         <result column="user_name" property="userName" />
     </resultMap>
-    <select id="page" resultType="com.usky.dm.model.InspectionPoint">
+    <select id="page" resultType="com.usky.dm.domain.InspectionPoint">
         select a.*,cp.owner_name as companyName
         from inspection_point as a
         inner join company as cp

service-dm/service-dm-biz/src/main/resources/mapper.dm/MaintianLogMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/MaintianLogMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.MaintianLogMapper">
+<mapper namespace="com.usky.dm.mapper.MaintianLogMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.MaintianLog">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.MaintianLog">
         <id column="id" property="id" />
         <result column="zb_id" property="zbId" />
         <result column="spot_id" property="spotId" />
@@ -19,7 +19,7 @@
         <result column="wbr_id" property="wbrId" />
         <result column="rec_count" property="recCount" />
     </resultMap>
-    <select id="page" resultType="com.usky.dm.model.MaintianLog">
+    <select id="page" resultType="com.usky.dm.domain.MaintianLog">
         select *
         from
         (select ml.*,cp.owner_name as companyName,dt.team_name as teamName,mp.plan_name as planName,inp.spot_name as pointName,pp.name as planPathName,

service-dm/service-dm-biz/src/main/resources/mapper.dm/MaintianPlanMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/MaintianPlanMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.MaintianPlanMapper">
+<mapper namespace="com.usky.dm.mapper.MaintianPlanMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.MaintianPlan">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.MaintianPlan">
         <id column="id" property="id" />
         <result column="plan_name" property="planName" />
         <result column="team_id" property="teamId" />
@@ -17,7 +17,7 @@
         <result column="data2" property="data2" />
         <result column="data3" property="data3" />
     </resultMap>
-    <select id="page" resultType="com.usky.dm.model.MaintianPlan">
+    <select id="page" resultType="com.usky.dm.domain.MaintianPlan">
         select a.*,cp.owner_name as companyName,dt.team_name as teamName,pp.name as planPathName
         from maintian_plan as a
         inner join company as cp

service-dm/service-dm-biz/src/main/resources/mapper.dm/MonitorDeviceMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/MonitorDeviceMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.MonitorDeviceMapper">
+<mapper namespace="com.usky.dm.mapper.MonitorDeviceMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.MonitorDevice">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.MonitorDevice">
         <id column="id" property="id" />
         <result column="fid" property="fid" />
         <result column="build" property="build" />

service-dm/service-dm-biz/src/main/resources/mapper.dm/MonitorPointMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/MonitorPointMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.MonitorPointMapper">
+<mapper namespace="com.usky.dm.mapper.MonitorPointMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.MonitorPoint">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.MonitorPoint">
         <id column="id" property="id" />
         <result column="object_name" property="objectName" />
         <result column="e_state" property="eState" />

service-dm/service-dm-biz/src/main/resources/mapper.dm/PlanChildMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/PlanChildMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.PlanChildMapper">
+<mapper namespace="com.usky.dm.mapper.PlanChildMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.PlanChild">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.PlanChild">
         <id column="id" property="id" />
         <result column="zb_id" property="zbId" />
         <result column="team_id" property="teamId" />
@@ -17,7 +17,7 @@
         <result column="data2" property="data2" />
         <result column="data3" property="data3" />
     </resultMap>
-    <select id="page" resultType="com.usky.dm.model.PlanChild">
+    <select id="page" resultType="com.usky.dm.domain.PlanChild">
         select pc.*,cp.owner_name as companyName,dt.team_name as teamName,mp.plan_name as planName,pp.name as planPathName
         from plan_child as pc
         inner join company as cp

service-dm/service-dm-biz/src/main/resources/mapper.dm/PlanPathMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/PlanPathMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.PlanPathMapper">
+<mapper namespace="com.usky.dm.mapper.PlanPathMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.PlanPath">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.PlanPath">
         <id column="id" property="id" />
         <result column="name" property="name" />
         <result column="i_order" property="iOrder" />

service-dm/service-dm-biz/src/main/resources/mapper.dm/PlanSpotMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/PlanSpotMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.PlanSpotMapper">
+<mapper namespace="com.usky.dm.mapper.PlanSpotMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.PlanSpot">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.PlanSpot">
         <id column="id" property="id" />
         <result column="zb_id" property="zbId" />
         <result column="spot_id" property="spotId" />

service-dm/service-dm-biz/src/main/resources/mapper.dm/ProductMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/ProductMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.ProductMapper">
+<mapper namespace="com.usky.dm.mapper.ProductMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.Product">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.Product">
         <id column="id" property="id" />
         <result column="name" property="name" />
         <result column="logo" property="logo" />

service-dm/service-dm-biz/src/main/resources/mapper.dm/RoomMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/RoomMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.RoomMapper">
+<mapper namespace="com.usky.dm.mapper.RoomMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.Room">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.Room">
         <id column="id" property="id" />
         <result column="floor_id" property="floorId" />
         <result column="room_id" property="roomId" />
@@ -13,7 +13,7 @@
         <result column="creat_man" property="creatMan" />
         <result column="status" property="status" />
     </resultMap>
-    <select id="page" resultType="com.usky.dm.model.Room">
+    <select id="page" resultType="com.usky.dm.domain.Room">
         select r.*,f.floor_name as floorName,b.build_name as buildName,b.id as buildId
         from
         room as r

service-dm/service-dm-biz/src/main/resources/mapper.dm/TbAlarmMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/TbAlarmMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.TbAlarmMapper">
+<mapper namespace="com.usky.dm.mapper.TbAlarmMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.TbAlarm">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.TbAlarm">
         <id column="id" property="id" />
         <result column="device_id" property="deviceId" />
         <result column="create_time" property="createTime" />
@@ -13,7 +13,7 @@
         <result column="alarm_status" property="alarmStatus" />
         <result column="remark" property="remark" />
     </resultMap>
-    <select id="selectCollect" resultType="com.usky.dm.persistence.mapper.vo.DeviceCollectVO">
+    <select id="selectCollect" resultType="com.usky.dm.mapper.vo.DeviceCollectVO">
         select d.dwtype as deviceType,ds.devicestatus as deviceStatus,count(*) deviceCount,ta.alarm_status as clzt,DATE_FORMAT(ta.alarm_time, "%Y-%m-%d" ) as deviceTime
         from device as d
         inner join device_status as ds
@@ -50,7 +50,7 @@
         </where>
         group by d.dwtype,ds.devicestatus,ta.alarm_status,deviceTime
     </select>
-    <select id="page" resultType="com.usky.dm.model.TbAlarm">
+    <select id="page" resultType="com.usky.dm.domain.TbAlarm">
         select ta.*,cp.owner_name as companyName,d.unitinfo as unitinfo
         from device as d
         inner join device_status as ds

service-dm/service-dm-biz/src/main/resources/mapper.dm/TbDeviceStatusMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/TbDeviceStatusMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.TbDeviceStatusMapper">
+<mapper namespace="com.usky.dm.mapper.TbDeviceStatusMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.TbDeviceStatus">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.TbDeviceStatus">
         <id column="id" property="id" />
         <result column="device_id" property="deviceId" />
         <result column="create_time" property="createTime" />
@@ -19,7 +19,7 @@
     </resultMap>
 
 
-    <select id="selectCollect" resultType="com.usky.dm.persistence.mapper.vo.DeviceCollectVO">
+    <select id="selectCollect" resultType="com.usky.dm.mapper.vo.DeviceCollectVO">
         select d.dwtype as deviceType,ds.devicestatus as deviceStatus,count(*) deviceCount,ta.alarm_status as clzt,DATE_FORMAT(ta.alarm_time, "%Y-%m-%d" ) as deviceTime
         from device as d
         inner join device_status as ds
@@ -53,7 +53,7 @@
         </where>
         group by d.dwtype,ds.devicestatus,ta.alarm_status,deviceTime
     </select>
-    <select id="page" resultType="com.usky.dm.model.TbDeviceStatus">
+    <select id="page" resultType="com.usky.dm.domain.TbDeviceStatus">
         select ta.*,cp.owner_name as companyName,d.unitinfo as unitinfo
         from device as d
         inner join device_status as ds

service-dm/service-dm-biz/src/main/resources/mapper.dm/TbInfoMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/TbInfoMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.TbInfoMapper">
+<mapper namespace="com.usky.dm.mapper.TbInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.TbInfo">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.TbInfo">
         <id column="id" property="id" />
         <result column="device_id" property="deviceId" />
 
@@ -12,7 +12,7 @@
         <result column="device_name" property="deviceName" />
         <result column="remark" property="remark" />
     </resultMap>
-    <select id="page" resultType="com.usky.dm.model.TbInfo">
+    <select id="page" resultType="com.usky.dm.domain.TbInfo">
         select ta.*,cp.owner_name as companyName
         from device as d
         inner join company as cp

service-dm/service-dm-biz/src/main/resources/mapper.dm/TestMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/TestMapper.xml

@@ -4,7 +4,19 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.usky.dm.domain.Test">
+        <id column="id" property="id" />
         <result column="name_value" property="nameValue" />
+        <result column="tenant_id" property="tenantId" />
     </resultMap>
+    <select id="all" resultType="com.usky.dm.domain.Test">
+        select *
+        from test
+        <where>
+            <if test="name != null">
+                and name_value = #{name}
+            </if>
+
+        </where>
+    </select>
 
 </mapper>

service-dm/service-dm-biz/src/main/resources/mapper.dm/WorkOrderMapper.xml → service-dm/service-dm-biz/src/main/resources/mapper/dm/WorkOrderMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usky.dm.persistence.mapper.WorkOrderMapper">
+<mapper namespace="com.usky.dm.mapper.WorkOrderMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.usky.dm.model.WorkOrder">
+    <resultMap id="BaseResultMap" type="com.usky.dm.domain.WorkOrder">
         <id column="id" property="id" />
         <result column="work_order_name" property="workOrderName" />
         <result column="work_order_content" property="workOrderContent" />
@@ -16,7 +16,7 @@
         <result column="cz_people" property="czPeople" />
         <result column="clnr" property="clnr" />
     </resultMap>
-    <select id="page" resultType="com.usky.dm.model.WorkOrder">
+    <select id="page" resultType="com.usky.dm.domain.WorkOrder">
         select worko.*,dt.team_name as teamName,
         (select `name` FROM devops_team_relation WHERE label = 2 and fid = dt.id) as dutyName,
         (select phone FROM devops_team_relation WHERE label = 2 and fid = dt.id) as dutyPhone,

service-system/pom.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>usky-modules</artifactId>
-        <groupId>com.usky</groupId>
-        <version>0.0.1</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>service-system</artifactId>
-
-    <packaging>pom</packaging>
-    <version>0.0.1</version>
-
-    <modules>
-        <module>service-system-biz</module>
-        <module>service-system-api</module>
-    </modules>
-</project>

service-system/service-system-api/pom.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>service-system</artifactId>
-        <groupId>com.usky</groupId>
-        <version>0.0.1</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>service-system-api</artifactId>
-    <!-- SpringCloud Openfeign -->
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.usky</groupId>
-            <artifactId>usky-common-core</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-    </build>
-
-</project>

service-system/service-system-api/src/main/java/com/usky/system/RemoteFileService.java

@@ -1,29 +0,0 @@
-//package com.usky.system;
-//
-//import com.baomidou.mybatisplus.extension.api.R;
-//import com.usky.common.core.bean.ApiResult;
-//import com.usky.system.domain.SysFileVO;
-//import com.usky.system.factory.RemoteFileFallbackFactory;
-//import org.springframework.cloud.openfeign.FeignClient;
-//import org.springframework.http.MediaType;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestPart;
-//import org.springframework.web.multipart.MultipartFile;
-//
-///**
-// * 文件服务
-// *
-// * @author ruoyi
-// */
-//@FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class)
-//public interface RemoteFileService
-//{
-//    /**
-//     * 上传文件
-//     *
-//     * @param file 文件信息
-//     * @return 结果
-//     */
-//    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-//    public ApiResult<SysFileVO> upload(@RequestPart(value = "file") MultipartFile file);
-//}

service-system/service-system-api/src/main/java/com/usky/system/RemoteLogService.java

@@ -1,37 +0,0 @@
-package com.usky.system;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.system.domain.SysLogininforVO;
-import com.usky.system.domain.SysOperLogVO;
-import com.usky.system.factory.RemoteLogFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 日志服务
- *
- * @author ruoyi
- */
-@FeignClient(contextId = "remoteLogService", value = "usky-system", fallbackFactory = RemoteLogFallbackFactory.class)
-public interface RemoteLogService
-{
-    /**
-     * 保存系统日志
-     *
-     * @param sysOperLog 日志实体
-     * @return 结果
-     */
-    @PostMapping("/operlog")
-    public ApiResult<Boolean> saveLog(@RequestBody SysOperLogVO sysOperLog);
-
-    /**
-     * 保存访问记录
-     *
-     * @param sysLogininfor 访问实体
-     * @return 结果
-     */
-    @PostMapping("/logininfor")
-    public ApiResult<Boolean> saveLogininfor(@RequestBody SysLogininforVO sysLogininfor);
-}

service-system/service-system-api/src/main/java/com/usky/system/RemoteUserService.java

@@ -1,39 +0,0 @@
-package com.usky.system;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.system.domain.SysUserVO;
-import com.usky.system.factory.RemoteUserFallbackFactory;
-import com.usky.system.model.LoginUser;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 用户服务
- * 
- * @author ruoyi
- */
-@FeignClient(contextId = "remoteUserService", value = "usky-system", fallbackFactory = RemoteUserFallbackFactory.class)
-public interface RemoteUserService
-{
-    /**
-     * 通过用户名查询用户信息
-     *
-     * @param username 用户名
-     * @return 结果
-     */
-    @GetMapping("/user/info/{username}")
-    public ApiResult<LoginUser> getUserInfo(@PathVariable("username") String username);
-
-    /**
-     * 注册用户信息
-     *
-     * @param sysUser 用户信息
-     * @return 结果
-     */
-    @PostMapping("/user/register")
-    public ApiResult<Boolean> registerUserInfo(@RequestBody SysUserVO sysUser);
-}

service-system/service-system-api/src/main/java/com/usky/system/domain/SysDeptVO.java

@@ -1,203 +0,0 @@
-package com.usky.system.domain;
-
-import com.usky.common.core.bean.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 部门表 sys_dept
- * 
- * @author ruoyi
- */
-public class SysDeptVO extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 部门ID */
-    private Long deptId;
-
-    /** 父部门ID */
-    private Long parentId;
-
-    /** 祖级列表 */
-    private String ancestors;
-
-    /** 部门名称 */
-    private String deptName;
-
-    /** 显示顺序 */
-    private String orderNum;
-
-    /** 负责人 */
-    private String leader;
-
-    /** 联系电话 */
-    private String phone;
-
-    /** 邮箱 */
-    private String email;
-
-    /** 部门状态:0正常,1停用 */
-    private String status;
-
-    /** 删除标志（0代表存在 2代表删除） */
-    private String delFlag;
-
-    /** 父部门名称 */
-    private String parentName;
-    
-    /** 子部门 */
-    private List<SysDeptVO> children = new ArrayList<SysDeptVO>();
-
-    public Long getDeptId()
-    {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId)
-    {
-        this.deptId = deptId;
-    }
-
-    public Long getParentId()
-    {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId)
-    {
-        this.parentId = parentId;
-    }
-
-    public String getAncestors()
-    {
-        return ancestors;
-    }
-
-    public void setAncestors(String ancestors)
-    {
-        this.ancestors = ancestors;
-    }
-
-    @NotBlank(message = "部门名称不能为空")
-    @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
-    public String getDeptName()
-    {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName)
-    {
-        this.deptName = deptName;
-    }
-
-    @NotBlank(message = "显示顺序不能为空")
-    public String getOrderNum()
-    {
-        return orderNum;
-    }
-
-    public void setOrderNum(String orderNum)
-    {
-        this.orderNum = orderNum;
-    }
-
-    public String getLeader()
-    {
-        return leader;
-    }
-
-    public void setLeader(String leader)
-    {
-        this.leader = leader;
-    }
-
-    @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
-    public String getPhone()
-    {
-        return phone;
-    }
-
-    public void setPhone(String phone)
-    {
-        this.phone = phone;
-    }
-
-    @Email(message = "邮箱格式不正确")
-    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
-    {
-        return email;
-    }
-
-    public void setEmail(String email)
-    {
-        this.email = email;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getDelFlag()
-    {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag)
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getParentName()
-    {
-        return parentName;
-    }
-
-    public void setParentName(String parentName)
-    {
-        this.parentName = parentName;
-    }
-
-    public List<SysDeptVO> getChildren()
-    {
-        return children;
-    }
-
-    public void setChildren(List<SysDeptVO> children)
-    {
-        this.children = children;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("deptId", getDeptId())
-            .append("parentId", getParentId())
-            .append("ancestors", getAncestors())
-            .append("deptName", getDeptName())
-            .append("orderNum", getOrderNum())
-            .append("leader", getLeader())
-            .append("phone", getPhone())
-            .append("email", getEmail())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

service-system/service-system-api/src/main/java/com/usky/system/domain/SysDictDataVO.java

@@ -1,167 +0,0 @@
-package com.usky.system.domain;
-
-import com.usky.common.core.bean.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-/**
- * 字典数据表 sys_dict_data
- * 
- * @author ruoyi
- */
-public class SysDictDataVO extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 字典编码 */
-    private Long dictCode;
-
-    /** 字典排序 */
-    private Long dictSort;
-
-    /** 字典标签 */
-    private String dictLabel;
-
-    /** 字典键值 */
-    private String dictValue;
-
-    /** 字典类型 */
-    private String dictType;
-
-    /** 样式属性（其他样式扩展） */
-    private String cssClass;
-
-    /** 表格字典样式 */
-    private String listClass;
-
-    /** 是否默认（Y是 N否） */
-    private String isDefault;
-
-    /** 状态（0正常 1停用） */
-    private String status;
-
-    public Long getDictCode()
-    {
-        return dictCode;
-    }
-
-    public void setDictCode(Long dictCode)
-    {
-        this.dictCode = dictCode;
-    }
-
-    public Long getDictSort()
-    {
-        return dictSort;
-    }
-
-    public void setDictSort(Long dictSort)
-    {
-        this.dictSort = dictSort;
-    }
-
-    @NotBlank(message = "字典标签不能为空")
-    @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
-    public String getDictLabel()
-    {
-        return dictLabel;
-    }
-
-    public void setDictLabel(String dictLabel)
-    {
-        this.dictLabel = dictLabel;
-    }
-
-    @NotBlank(message = "字典键值不能为空")
-    @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
-    public String getDictValue()
-    {
-        return dictValue;
-    }
-
-    public void setDictValue(String dictValue)
-    {
-        this.dictValue = dictValue;
-    }
-
-    @NotBlank(message = "字典类型不能为空")
-    @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
-    public String getDictType()
-    {
-        return dictType;
-    }
-
-    public void setDictType(String dictType)
-    {
-        this.dictType = dictType;
-    }
-
-    @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
-    public String getCssClass()
-    {
-        return cssClass;
-    }
-
-    public void setCssClass(String cssClass)
-    {
-        this.cssClass = cssClass;
-    }
-
-    public String getListClass()
-    {
-        return listClass;
-    }
-
-    public void setListClass(String listClass)
-    {
-        this.listClass = listClass;
-    }
-
-    public boolean getDefault()
-    {
-        return true;
-    }
-
-    public String getIsDefault()
-    {
-        return isDefault;
-    }
-
-    public void setIsDefault(String isDefault)
-    {
-        this.isDefault = isDefault;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("dictCode", getDictCode())
-            .append("dictSort", getDictSort())
-            .append("dictLabel", getDictLabel())
-            .append("dictValue", getDictValue())
-            .append("dictType", getDictType())
-            .append("cssClass", getCssClass())
-            .append("listClass", getListClass())
-            .append("isDefault", getIsDefault())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

service-system/service-system-api/src/main/java/com/usky/system/domain/SysDictTypeVO.java

@@ -1,90 +0,0 @@
-package com.usky.system.domain;
-
-
-import com.usky.common.core.bean.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-/**
- * 字典类型表 sys_dict_type
- * 
- * @author ruoyi
- */
-public class SysDictTypeVO extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 字典主键 */
-    private Long dictId;
-
-    /** 字典名称 */
-    private String dictName;
-
-    /** 字典类型 */
-    private String dictType;
-
-    /** 状态（0正常 1停用） */
-    private String status;
-
-    public Long getDictId()
-    {
-        return dictId;
-    }
-
-    public void setDictId(Long dictId)
-    {
-        this.dictId = dictId;
-    }
-
-    @NotBlank(message = "字典名称不能为空")
-    @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
-    public String getDictName()
-    {
-        return dictName;
-    }
-
-    public void setDictName(String dictName)
-    {
-        this.dictName = dictName;
-    }
-
-    @NotBlank(message = "字典类型不能为空")
-    @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
-    public String getDictType()
-    {
-        return dictType;
-    }
-
-    public void setDictType(String dictType)
-    {
-        this.dictType = dictType;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("dictId", getDictId())
-            .append("dictName", getDictName())
-            .append("dictType", getDictType())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

service-system/service-system-api/src/main/java/com/usky/system/domain/SysFileVO.java

@@ -1,50 +0,0 @@
-package com.usky.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 文件信息
- * 
- * @author ruoyi
- */
-public class SysFileVO
-{
-    /**
-     * 文件名称
-     */
-    private String name;
-
-    /**
-     * 文件地址
-     */
-    private String url;
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    public String getUrl()
-    {
-        return url;
-    }
-
-    public void setUrl(String url)
-    {
-        this.url = url;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("name", getName())
-            .append("url", getUrl())
-            .toString();
-    }
-}

service-system/service-system-api/src/main/java/com/usky/system/domain/SysLogininforVO.java

@@ -1,95 +0,0 @@
-package com.usky.system.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.usky.common.core.bean.BaseEntity;
-
-import java.util.Date;
-
-/**
- * 系统访问记录表 sys_logininfor
- * 
- * @author ruoyi
- */
-public class SysLogininforVO extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** ID */
-    private Long infoId;
-
-    /** 用户账号 */
-    private String userName;
-
-    /** 状态 0成功 1失败 */
-    private String status;
-
-    /** 地址 */
-    private String ipaddr;
-
-    /** 描述 */
-    private String msg;
-
-    /** 访问时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date accessTime;
-
-    public Long getInfoId()
-    {
-        return infoId;
-    }
-
-    public void setInfoId(Long infoId)
-    {
-        this.infoId = infoId;
-    }
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getIpaddr()
-    {
-        return ipaddr;
-    }
-
-    public void setIpaddr(String ipaddr)
-    {
-        this.ipaddr = ipaddr;
-    }
-
-    public String getMsg()
-    {
-        return msg;
-    }
-
-    public void setMsg(String msg)
-    {
-        this.msg = msg;
-    }
-
-    public Date getAccessTime()
-    {
-        return accessTime;
-    }
-
-    public void setAccessTime(Date accessTime)
-    {
-        this.accessTime = accessTime;
-    }
-}

service-system/service-system-api/src/main/java/com/usky/system/domain/SysOperLogVO.java

@@ -1,225 +0,0 @@
-package com.usky.system.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.usky.common.core.bean.BaseEntity;
-
-import java.util.Date;
-
-/**
- * 操作日志记录表 oper_log
- * 
- * @author ruoyi
- */
-public class SysOperLogVO extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 日志主键 */
-    private Long operId;
-
-    /** 操作模块 */
-    private String title;
-
-    /** 业务类型（0其它 1新增 2修改 3删除） */
-    private Integer businessType;
-
-    /** 业务类型数组 */
-    private Integer[] businessTypes;
-
-    /** 请求方法 */
-    private String method;
-
-    /** 请求方式 */
-    private String requestMethod;
-
-    /** 操作类别（0其它 1后台用户 2手机端用户） */
-    private Integer operatorType;
-
-    /** 操作人员 */
-    private String operName;
-
-    /** 部门名称 */
-    private String deptName;
-
-    /** 请求url */
-    private String operUrl;
-
-    /** 操作地址 */
-    private String operIp;
-
-    /** 请求参数 */
-    private String operParam;
-
-    /** 返回参数 */
-    private String jsonResult;
-
-    /** 操作状态（0正常 1异常） */
-    private Integer status;
-
-    /** 错误消息 */
-    private String errorMsg;
-
-    /** 操作时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date operTime;
-
-    public Long getOperId()
-    {
-        return operId;
-    }
-
-    public void setOperId(Long operId)
-    {
-        this.operId = operId;
-    }
-
-    public String getTitle()
-    {
-        return title;
-    }
-
-    public void setTitle(String title)
-    {
-        this.title = title;
-    }
-
-    public Integer getBusinessType()
-    {
-        return businessType;
-    }
-
-    public void setBusinessType(Integer businessType)
-    {
-        this.businessType = businessType;
-    }
-
-    public Integer[] getBusinessTypes()
-    {
-        return businessTypes;
-    }
-
-    public void setBusinessTypes(Integer[] businessTypes)
-    {
-        this.businessTypes = businessTypes;
-    }
-
-    public String getMethod()
-    {
-        return method;
-    }
-
-    public void setMethod(String method)
-    {
-        this.method = method;
-    }
-
-    public String getRequestMethod()
-    {
-        return requestMethod;
-    }
-
-    public void setRequestMethod(String requestMethod)
-    {
-        this.requestMethod = requestMethod;
-    }
-
-    public Integer getOperatorType()
-    {
-        return operatorType;
-    }
-
-    public void setOperatorType(Integer operatorType)
-    {
-        this.operatorType = operatorType;
-    }
-
-    public String getOperName()
-    {
-        return operName;
-    }
-
-    public void setOperName(String operName)
-    {
-        this.operName = operName;
-    }
-
-    public String getDeptName()
-    {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName)
-    {
-        this.deptName = deptName;
-    }
-
-    public String getOperUrl()
-    {
-        return operUrl;
-    }
-
-    public void setOperUrl(String operUrl)
-    {
-        this.operUrl = operUrl;
-    }
-
-    public String getOperIp()
-    {
-        return operIp;
-    }
-
-    public void setOperIp(String operIp)
-    {
-        this.operIp = operIp;
-    }
-
-    public String getOperParam()
-    {
-        return operParam;
-    }
-
-    public void setOperParam(String operParam)
-    {
-        this.operParam = operParam;
-    }
-
-    public String getJsonResult()
-    {
-        return jsonResult;
-    }
-
-    public void setJsonResult(String jsonResult)
-    {
-        this.jsonResult = jsonResult;
-    }
-
-    public Integer getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(Integer status)
-    {
-        this.status = status;
-    }
-
-    public String getErrorMsg()
-    {
-        return errorMsg;
-    }
-
-    public void setErrorMsg(String errorMsg)
-    {
-        this.errorMsg = errorMsg;
-    }
-
-    public Date getOperTime()
-    {
-        return operTime;
-    }
-
-    public void setOperTime(Date operTime)
-    {
-        this.operTime = operTime;
-    }
-}

service-system/service-system-api/src/main/java/com/usky/system/domain/SysRoleVO.java

@@ -1,221 +0,0 @@
-package com.usky.system.domain;
-
-
-import com.usky.common.core.bean.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-
-/**
- * 角色表 sys_role
- * 
- * @author ruoyi
- */
-public class SysRoleVO extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 角色ID */
-    private Long roleId;
-
-    /** 角色名称 */
-    private String roleName;
-
-    /** 角色权限 */
-    private String roleKey;
-
-    /** 角色排序 */
-    private String roleSort;
-
-    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
-    private String dataScope;
-
-    /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
-    private boolean menuCheckStrictly;
-
-    /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
-    private boolean deptCheckStrictly;
-
-    /** 角色状态（0正常 1停用） */
-    private String status;
-
-    /** 删除标志（0代表存在 2代表删除） */
-    private String delFlag;
-
-    /** 用户是否存在此角色标识 默认不存在 */
-    private boolean flag = false;
-
-    /** 菜单组 */
-    private Long[] menuIds;
-
-    /** 部门组（数据权限） */
-    private Long[] deptIds;
-
-    public SysRoleVO()
-    {
-
-    }
-
-    public SysRoleVO(Long roleId)
-    {
-        this.roleId = roleId;
-    }
-
-    public Long getRoleId()
-    {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId)
-    {
-        this.roleId = roleId;
-    }
-
-    public boolean isAdmin()
-    {
-        return isAdmin(this.roleId);
-    }
-
-    public static boolean isAdmin(Long roleId)
-    {
-        return roleId != null && 1L == roleId;
-    }
-
-    @NotBlank(message = "角色名称不能为空")
-    @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
-    public String getRoleName()
-    {
-        return roleName;
-    }
-
-    public void setRoleName(String roleName)
-    {
-        this.roleName = roleName;
-    }
-
-    @NotBlank(message = "权限字符不能为空")
-    @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
-    public String getRoleKey()
-    {
-        return roleKey;
-    }
-
-    public void setRoleKey(String roleKey)
-    {
-        this.roleKey = roleKey;
-    }
-
-    @NotBlank(message = "显示顺序不能为空")
-    public String getRoleSort()
-    {
-        return roleSort;
-    }
-
-    public void setRoleSort(String roleSort)
-    {
-        this.roleSort = roleSort;
-    }
-
-    public String getDataScope()
-    {
-        return dataScope;
-    }
-
-    public void setDataScope(String dataScope)
-    {
-        this.dataScope = dataScope;
-    }
-
-    public boolean isMenuCheckStrictly()
-    {
-        return menuCheckStrictly;
-    }
-
-    public void setMenuCheckStrictly(boolean menuCheckStrictly)
-    {
-        this.menuCheckStrictly = menuCheckStrictly;
-    }
-
-    public boolean isDeptCheckStrictly()
-    {
-        return deptCheckStrictly;
-    }
-
-    public void setDeptCheckStrictly(boolean deptCheckStrictly)
-    {
-        this.deptCheckStrictly = deptCheckStrictly;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getDelFlag()
-    {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag)
-    {
-        this.delFlag = delFlag;
-    }
-
-    public boolean isFlag()
-    {
-        return flag;
-    }
-
-    public void setFlag(boolean flag)
-    {
-        this.flag = flag;
-    }
-
-    public Long[] getMenuIds()
-    {
-        return menuIds;
-    }
-
-    public void setMenuIds(Long[] menuIds)
-    {
-        this.menuIds = menuIds;
-    }
-
-    public Long[] getDeptIds()
-    {
-        return deptIds;
-    }
-
-    public void setDeptIds(Long[] deptIds)
-    {
-        this.deptIds = deptIds;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("roleId", getRoleId())
-            .append("roleName", getRoleName())
-            .append("roleKey", getRoleKey())
-            .append("roleSort", getRoleSort())
-            .append("dataScope", getDataScope())
-            .append("menuCheckStrictly", isMenuCheckStrictly())
-            .append("deptCheckStrictly", isDeptCheckStrictly())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

service-system/service-system-api/src/main/java/com/usky/system/domain/SysUserVO.java

@@ -1,321 +0,0 @@
-package com.usky.system.domain;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.usky.common.core.bean.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 用户对象 sys_user
- * 
- * @author ruoyi
- */
-public class SysUserVO extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 用户ID */
-    private Long userId;
-
-    /** 部门ID */
-    private Long deptId;
-
-    /** 用户账号 */
-    private String userName;
-
-    /** 用户昵称 */
-    private String nickName;
-
-    /** 用户邮箱 */
-    private String email;
-
-    /** 手机号码 */
-    private String phonenumber;
-
-    /** 用户性别 */
-    private String sex;
-
-    /** 用户头像 */
-    private String avatar;
-
-    /** 密码 */
-    private String password;
-
-    /** 帐号状态（0正常 1停用） */
-    private String status;
-
-    /** 删除标志（0代表存在 2代表删除） */
-    private String delFlag;
-
-    /** 最后登录IP */
-    private String loginIp;
-
-    /** 最后登录时间 */
-    private Date loginDate;
-
-    /** 部门对象 */
-    private SysDeptVO dept;
-
-    /** 角色对象 */
-    private List<SysRoleVO> roles;
-
-    /** 角色组 */
-    private Long[] roleIds;
-
-    /** 岗位组 */
-    private Long[] postIds;
-
-    /** 角色ID */
-    private Long roleId;
-    /**
-     * 租户id
-     */
-    private Integer tenantId;
-
-    public Integer getTenantId() {
-        return tenantId;
-    }
-
-    public void setTenantId(Integer tenantId) {
-        this.tenantId = tenantId;
-    }
-
-
-
-    public SysUserVO()
-    {
-
-    }
-
-    public SysUserVO(Long userId)
-    {
-        this.userId = userId;
-    }
-
-    public Long getUserId()
-    {
-        return userId;
-    }
-
-    public void setUserId(Long userId)
-    {
-        this.userId = userId;
-    }
-
-    public boolean isAdmin()
-    {
-        return isAdmin(this.userId);
-    }
-
-    public static boolean isAdmin(Long userId)
-    {
-        return userId != null && 1L == userId;
-    }
-
-    public Long getDeptId()
-    {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId)
-    {
-        this.deptId = deptId;
-    }
-
-    @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-    public String getNickName()
-    {
-        return nickName;
-    }
-
-    public void setNickName(String nickName)
-    {
-        this.nickName = nickName;
-    }
-
-    @NotBlank(message = "用户账号不能为空")
-    @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符")
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    @Email(message = "邮箱格式不正确")
-    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
-    {
-        return email;
-    }
-
-    public void setEmail(String email)
-    {
-        this.email = email;
-    }
-
-    @Size(min = 0, max = 11, message = "手机号码长度不能超过11个字符")
-    public String getPhonenumber()
-    {
-        return phonenumber;
-    }
-
-    public void setPhonenumber(String phonenumber)
-    {
-        this.phonenumber = phonenumber;
-    }
-
-    public String getSex()
-    {
-        return sex;
-    }
-
-    public void setSex(String sex)
-    {
-        this.sex = sex;
-    }
-
-    public String getAvatar()
-    {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar)
-    {
-        this.avatar = avatar;
-    }
-
-    @JsonProperty
-    public String getPassword()
-    {
-        return password;
-    }
-
-    public void setPassword(String password)
-    {
-        this.password = password;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getDelFlag()
-    {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag)
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getLoginIp()
-    {
-        return loginIp;
-    }
-
-    public void setLoginIp(String loginIp)
-    {
-        this.loginIp = loginIp;
-    }
-
-    public Date getLoginDate()
-    {
-        return loginDate;
-    }
-
-    public void setLoginDate(Date loginDate)
-    {
-        this.loginDate = loginDate;
-    }
-
-    public SysDeptVO getDept()
-    {
-        return dept;
-    }
-
-    public void setDept(SysDeptVO dept)
-    {
-        this.dept = dept;
-    }
-
-    public List<SysRoleVO> getRoles()
-    {
-        return roles;
-    }
-
-    public void setRoles(List<SysRoleVO> roles)
-    {
-        this.roles = roles;
-    }
-
-    public Long[] getRoleIds()
-    {
-        return roleIds;
-    }
-
-    public void setRoleIds(Long[] roleIds)
-    {
-        this.roleIds = roleIds;
-    }
-
-    public Long[] getPostIds()
-    {
-        return postIds;
-    }
-
-    public void setPostIds(Long[] postIds)
-    {
-        this.postIds = postIds;
-    }
-
-    public Long getRoleId()
-    {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId)
-    {
-        this.roleId = roleId;
-    }
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("userId", getUserId())
-            .append("deptId", getDeptId())
-            .append("userName", getUserName())
-            .append("nickName", getNickName())
-            .append("email", getEmail())
-            .append("phonenumber", getPhonenumber())
-            .append("sex", getSex())
-            .append("avatar", getAvatar())
-            .append("password", getPassword())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("loginIp", getLoginIp())
-            .append("loginDate", getLoginDate())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .append("dept", getDept())
-            .toString();
-    }
-}

service-system/service-system-api/src/main/java/com/usky/system/factory/RemoteFileFallbackFactory.java

@@ -1,35 +0,0 @@
-//package com.usky.system.factory;
-//
-//import com.usky.common.core.bean.ApiResult;
-//import com.usky.system.RemoteFileService;
-//import com.usky.system.domain.SysFileVO;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.cloud.openfeign.FallbackFactory;
-//import org.springframework.stereotype.Component;
-//import org.springframework.web.multipart.MultipartFile;
-//
-///**
-// * 文件服务降级处理
-// *
-// * @author ruoyi
-// */
-//@Component
-//public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileService>
-//{
-//    private static final Logger log = LoggerFactory.getLogger(RemoteFileFallbackFactory.class);
-//
-//    @Override
-//    public RemoteFileService create(Throwable throwable)
-//    {
-//        log.error("文件服务调用失败:{}", throwable.getMessage());
-//        return new RemoteFileService()
-//        {
-//            @Override
-//            public ApiResult<SysFileVO> upload(MultipartFile file)
-//            {
-//                return ApiResult.error("500","上传文件失败:" + throwable.getMessage());
-//            }
-//        };
-//    }
-//}

service-system/service-system-api/src/main/java/com/usky/system/factory/RemoteLogFallbackFactory.java

@@ -1,42 +0,0 @@
-package com.usky.system.factory;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.system.RemoteLogService;
-import com.usky.system.domain.SysLogininforVO;
-import com.usky.system.domain.SysOperLogVO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * 日志服务降级处理
- *
- * @author ruoyi
- */
-@Component
-public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class);
-
-    @Override
-    public RemoteLogService create(Throwable throwable)
-    {
-        log.error("日志服务调用失败:{}", throwable.getMessage());
-        return new RemoteLogService()
-        {
-            @Override
-            public ApiResult<Boolean> saveLog(SysOperLogVO sysOperLog)
-            {
-                return ApiResult.error("500","保存日志失败");
-            }
-
-            @Override
-            public ApiResult<Boolean> saveLogininfor(SysLogininforVO sysLogininfor)
-            {
-                return ApiResult.error("500","保存日志失败");
-            }
-        };
-
-    }
-}

service-system/service-system-api/src/main/java/com/usky/system/factory/RemoteUserFallbackFactory.java

@@ -1,42 +0,0 @@
-package com.usky.system.factory;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.system.RemoteUserService;
-import com.usky.system.domain.SysUserVO;
-import com.usky.system.model.LoginUser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-/**
- * 用户服务降级处理
- * 
- * @author ruoyi
- */
-@Component
-public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserService>
-{
-    private static final Logger log = LoggerFactory.getLogger(RemoteUserFallbackFactory.class);
-
-    @Override
-    public RemoteUserService create(Throwable throwable)
-    {
-        log.error("用户服务调用失败:{}", throwable.getMessage());
-        return new RemoteUserService()
-        {
-            @Override
-            public ApiResult<LoginUser> getUserInfo(String username)
-            {
-                return ApiResult.error("500","获取用户失败:" + throwable.getMessage());
-            }
-
-            @Override
-            public ApiResult<Boolean> registerUserInfo(SysUserVO sysUser)
-            {
-                return ApiResult.error("500","注册用户失败:" + throwable.getMessage());
-            }
-        };
-    }
-}

service-system/service-system-api/src/main/java/com/usky/system/model/LoginUser.java

@@ -1,152 +0,0 @@
-package com.usky.system.model;
-
-
-import com.usky.system.domain.SysUserVO;
-
-import java.io.Serializable;
-import java.util.Set;
-
-/**
- * 用户信息
- *
- * @author ruoyi
- */
-public class LoginUser implements Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户唯一标识
-     */
-    private String token;
-
-    /**
-     * 用户名id
-     */
-    private Long userid;
-
-    /**
-     * 用户名
-     */
-    private String username;
-
-    /**
-     * 登录时间
-     */
-    private Long loginTime;
-
-    /**
-     * 过期时间
-     */
-    private Long expireTime;
-
-    /**
-     * 登录IP地址
-     */
-    private String ipaddr;
-
-    /**
-     * 权限列表
-     */
-    private Set<String> permissions;
-
-    /**
-     * 角色列表
-     */
-    private Set<String> roles;
-
-    /**
-     * 用户信息
-     */
-    private SysUserVO sysUser;
-
-    public String getToken()
-    {
-        return token;
-    }
-
-    public void setToken(String token)
-    {
-        this.token = token;
-    }
-
-    public Long getUserid()
-    {
-        return userid;
-    }
-
-    public void setUserid(Long userid)
-    {
-        this.userid = userid;
-    }
-
-    public String getUsername()
-    {
-        return username;
-    }
-
-    public void setUsername(String username)
-    {
-        this.username = username;
-    }
-
-    public Long getLoginTime()
-    {
-        return loginTime;
-    }
-
-    public void setLoginTime(Long loginTime)
-    {
-        this.loginTime = loginTime;
-    }
-
-    public Long getExpireTime()
-    {
-        return expireTime;
-    }
-
-    public void setExpireTime(Long expireTime)
-    {
-        this.expireTime = expireTime;
-    }
-
-    public String getIpaddr()
-    {
-        return ipaddr;
-    }
-
-    public void setIpaddr(String ipaddr)
-    {
-        this.ipaddr = ipaddr;
-    }
-
-    public Set<String> getPermissions()
-    {
-        return permissions;
-    }
-
-    public void setPermissions(Set<String> permissions)
-    {
-        this.permissions = permissions;
-    }
-
-    public Set<String> getRoles()
-    {
-        return roles;
-    }
-
-    public void setRoles(Set<String> roles)
-    {
-        this.roles = roles;
-    }
-
-    public SysUserVO getSysUser()
-    {
-        return sysUser;
-    }
-
-    public void setSysUser(SysUserVO sysUser)
-    {
-        this.sysUser = sysUser;
-    }
-}

service-system/service-system-biz/pom.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>service-system</artifactId>
-        <groupId>com.usky</groupId>
-        <version>0.0.1</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>service-system-biz</artifactId>
-    <dependencies>
-
-
-        <dependency>
-            <groupId>com.usky</groupId>
-            <artifactId>common-cloud-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- Pagehelper -->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.github.shalousun</groupId>
-                <artifactId>smart-doc-maven-plugin</artifactId>
-                <version>2.1.1</version>
-                <configuration>
-                    <!--指定生成文档的使用的配置文件,配置文件放在自己的项目中-->
-                    <configFile>./src/main/resources/smart-doc.json</configFile>
-                    <!--指定项目名称-->
-                    <projectName>test</projectName>
-                    <!--                    <excludes>-->
-                    <!--                        <exclude>com.bizmatics:product-service-provider</exclude>-->
-                    <!--                        <exclude>cn.afterturn:easypoi-web</exclude>-->
-                    <!--                    </excludes>-->
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

service-system/service-system-biz/src/main/java/com/usky/system/RuoYiSystemApplication.java

@@ -1,39 +0,0 @@
-package com.usky.system;
-
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
-
-/**
- * 系统模块
- * 
- * @author ruoyi
- */
-
-
-@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
-@EnableFeignClients(basePackages = {"com.usky"})
-@MapperScan(value = "com.usky.system.mapper")
-@ComponentScan(basePackages = {"com.usky"})
-@SpringBootApplication
-public class RuoYiSystemApplication
-{
-    public static void main(String[] args)
-    {
-        SpringApplication.run(RuoYiSystemApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  永天系统模块启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
-                " .-------.       ____     __        \n" +
-                " |  _ _   \\      \\   \\   /  /    \n" +
-                " | ( ' )  |       \\  _. /  '       \n" +
-                " |(_ o _) /        _( )_ .'         \n" +
-                " | (_,_).' __  ___(_ o _)'          \n" +
-                " |  |\\ \\  |  ||   |(_,_)'         \n" +
-                " |  | \\ `'   /|   `-'  /           \n" +
-                " |  |  \\    /  \\      /           \n" +
-                " ''-'   `'-'    `-..-'              ");
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/MybatisGeneratorUtils.java

@@ -1,108 +0,0 @@
-//package com.usky.system.controller;//package com.usky.system.controller;//package com.usky.dm.controller.web.business;//package com.usky.dm.controller.web;
-//
-//import com.baomidou.mybatisplus.core.toolkit.StringPool;
-//import com.baomidou.mybatisplus.generator.AutoGenerator;
-//import com.baomidou.mybatisplus.generator.InjectionConfig;
-//import com.baomidou.mybatisplus.generator.config.*;
-//import com.baomidou.mybatisplus.generator.config.po.TableInfo;
-//import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
-//
-//import java.io.File;
-//import java.util.ArrayList;
-//import java.util.List;
-//
-///**
-// * @author yq
-// * @date 2021/7/6 11:42
-// */
-//public class MybatisGeneratorUtils {
-//    public static void main(String[] args) {
-//
-//            shell("service-system","service-system-biz");
-//    }
-//
-//    private static void shell(String parentName,String model) {
-//
-//        AutoGenerator mpg = new AutoGenerator();
-//        //1、全局配置
-//        GlobalConfig gc = new GlobalConfig();
-////        File file = new File(model);
-////        String path = file.getAbsolutePath();
-//        String projectPath = System.getProperty("user.dir");
-//        projectPath+="/"+parentName;
-//        projectPath+="/"+model;
-//        gc.setOutputDir(projectPath+ "/src/main/java");  //生成路径(一般都是生成在此项目的src/main/java下面)
-//        //修改为自己的名字
-//        gc.setAuthor("ya"); //设置作者
-//        gc.setOpen(false);
-//        gc.setFileOverride(true); //第二次生成会把第一次生成的覆盖掉
-//        gc.setServiceName("%sService"); //生成的service接口名字首字母是否为I，这样设置就没有
-//        gc.setBaseResultMap(true); //生成resultMap
-//        mpg.setGlobalConfig(gc);
-//
-//        //2、数据源配置
-//        //修改数据源
-//        DataSourceConfig dsc = new DataSourceConfig();
-//        dsc.setUrl("jdbc:mysql://47.111.81.118:3306/dm?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
-//        dsc.setDriverName("com.mysql.jdbc.Driver");
-//        dsc.setUsername("root");
-//        dsc.setPassword("Yt2021");
-//        mpg.setDataSource(dsc);
-//
-//        // 3、包配置
-//        PackageConfig pc = new PackageConfig();
-//        pc.setParent("com.usky.system");
-//        pc.setController("controller.web");
-//        pc.setEntity("domain");
-//        pc.setMapper("mapper");
-//        pc.setService("service");
-//        pc.setServiceImpl("service.impl");
-////        pc.setXml("mapper.demo");
-//        //pc.setModuleName("test");
-//        mpg.setPackageInfo(pc);
-//
-//        // 4、策略配置
-//        StrategyConfig strategy = new StrategyConfig();
-//        strategy.setNaming(NamingStrategy.underline_to_camel);
-//        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
-//        strategy.setSuperMapperClass("com.usky.common.mvc.base.CrudMapper");
-//        strategy.setSuperServiceClass("com.usky.common.mvc.base.CrudService");
-//        strategy.setSuperServiceImplClass("com.usky.common.mvc.base.AbstractCrudService");
-//        // strategy.setTablePrefix("t_"); // 表名前缀
-//        strategy.setEntityLombokModel(true); //使用lombok
-//        //修改自己想要生成的表
-//        strategy.setInclude("sys_config");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
-//        mpg.setStrategy(strategy);
-//
-//        // 关闭默认 xml 生成，调整生成 至 根目录
-//        //修改对应的模块名称
-//        TemplateConfig tc = new TemplateConfig();
-//        // 自定义配置
-//        InjectionConfig cfg = new InjectionConfig() {
-//            @Override
-//            public void initMap() {
-//                // to do nothing
-//            }
-//        };
-//        //如果模板引擎是 velocity
-//        String templatePath = "/templates/mapper.xml.vm";
-//        // 自定义输出配置
-//        List<FileOutConfig> focList = new ArrayList<>();
-//        // 自定义配置会被优先输出
-//        String finalProjectPath = projectPath;
-//        focList.add(new FileOutConfig(templatePath) {
-//            @Override
-//            public String outputFile(TableInfo tableInfo) {
-//                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
-//                return finalProjectPath + "/src/main/resources/mapper.system" + "/"
-//                        + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
-//            }
-//        });
-//        cfg.setFileOutConfigList(focList);
-//        mpg.setCfg(cfg);
-//        tc.setXml(null);
-//        mpg.setTemplate(tc);
-//        //5、执行
-//        mpg.execute();
-//    }
-//}

service-system/service-system-biz/src/main/java/com/usky/system/controller/api/SysLogControllerApi.java

@@ -1,38 +0,0 @@
-package com.usky.system.controller.api;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.util.BeanMapperUtils;
-import com.usky.system.RemoteLogService;
-import com.usky.system.domain.SysLogininfor;
-import com.usky.system.domain.SysLogininforVO;
-import com.usky.system.domain.SysOperLog;
-import com.usky.system.domain.SysOperLogVO;
-import com.usky.system.service.ISysLogininforService;
-import com.usky.system.service.ISysOperLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author yq
- * @date 2022/7/1 11:08
- */
-@RequestMapping("/logApi")
-@RestController
-public class SysLogControllerApi implements RemoteLogService {
-
-    @Autowired
-    private ISysOperLogService sysOperLogService;
-
-    @Autowired
-    private ISysLogininforService sysLogininforService;
-    @Override
-    public ApiResult<Boolean> saveLog(SysOperLogVO sysOperLog) {
-        return ApiResult.success(sysOperLogService.save(BeanMapperUtils.map(sysOperLog, SysOperLog.class)));
-    }
-
-    @Override
-    public ApiResult<Boolean> saveLogininfor(SysLogininforVO sysLogininfor) {
-        return ApiResult.success(sysLogininforService.save(BeanMapperUtils.map(sysLogininfor, SysLogininfor.class)));
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/api/SysUserControllerApi.java

@@ -1,29 +0,0 @@
-package com.usky.system.controller.api;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.util.BeanMapperUtils;
-import com.usky.system.RemoteUserService;
-import com.usky.system.domain.SysUser;
-import com.usky.system.domain.SysUserVO;
-import com.usky.system.model.LoginUser;
-import com.usky.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class SysUserControllerApi implements RemoteUserService {
-
-
-    @Autowired
-    private ISysUserService iSysUserService;
-
-    @Override
-    public ApiResult<LoginUser> getUserInfo(String username) {
-        return ApiResult.success(iSysUserService.getUserInfo(username));
-    }
-
-    @Override
-    public ApiResult<Boolean> registerUserInfo(SysUserVO sysUser) {
-        return ApiResult.success(iSysUserService.register(BeanMapperUtils.map(sysUser, SysUser.class)));
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/AuthorityConfigController.java

@@ -1,79 +0,0 @@
-package com.usky.system.controller.web;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.system.domain.SysMenu;
-import com.usky.system.service.ISysMenuService;
-import com.usky.system.service.SysPlatformMenuService;
-import com.usky.system.service.vo.TenantMenuVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 租户管理-权限配置
- *
- * @author ya
- * @since 2022-05-05
- */
-@RestController
-@RequestMapping("/authorityConfig")
-public class AuthorityConfigController {
-
-    @Autowired
-    private SysPlatformMenuService sysPlatformMenuService;
-
-    @Autowired
-    private ISysMenuService menuService;
-
-
-    /**
-     * 租户管理-权限配置-目录查询
-     *
-     * @param platformId 平台ID
-     * @param tenantId   租户ID
-     * @return
-     */
-    @GetMapping("getMenuList")
-    public ApiResult<Map<String, Object>> getMenuList(@RequestParam(value = "platformId") Integer platformId,
-                                                      @RequestParam(value = "tenantId") Integer tenantId) {
-        return ApiResult.success(sysPlatformMenuService.getMenuList(platformId, tenantId));
-    }
-
-
-    /**
-     * 租户管理-权限配置-目录查询
-     *
-     * @param platformId 平台ID
-     * @param tenantId   租户ID
-     * @return
-     */
-    @GetMapping("getAuthorityConfigMenuList")
-    public ApiResult<Map<String, Object>> getAuthorityConfigMenuList(@RequestParam(value = "platformId") Integer platformId,
-                                                                     @RequestParam(value = "tenantId") Integer tenantId) {
-        List<SysMenu> menus =sysPlatformMenuService.getPlatformMenuList(platformId);
-        Map<String, Object> ajax = new HashMap<>();
-        ajax.put("checkedKeys", sysPlatformMenuService.selectPlatformMenu(tenantId));
-        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
-        return ApiResult.success(ajax);
-    }
-
-    /**
-     * 租户管理-权限配置-目录保存
-     *
-     * @param tenantMenuVo
-     * @return
-     */
-//    @Log(title = "权限配置", businessType = BusinessType.UPDATE)
-    @PostMapping("updateMenu")
-    public ApiResult<Void> updateMenu(@RequestBody TenantMenuVo tenantMenuVo) {
-        sysPlatformMenuService.updateMenu(tenantMenuVo);
-        return ApiResult.success();
-    }
-
-
-}
-

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/BaseController.java

@@ -1,80 +0,0 @@
-package com.usky.system.controller.web;
-
-
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.common.core.util.DateUtils;
-import com.usky.system.controller.web.page.PageDomain;
-import com.usky.system.controller.web.page.TableDataInfo;
-import com.usky.system.controller.web.page.TableSupport;
-import com.usky.system.service.util.SqlUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
-
-import java.beans.PropertyEditorSupport;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * web层通用数据处理
- */
-public class BaseController {
-    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
-
-    /**
-     * 将前台传递过来的日期格式的字符串，自动转化为Date类型
-     */
-    @InitBinder
-    public void initBinder(WebDataBinder binder) {
-        // Date 类型转换
-        binder.registerCustomEditor(Date.class, new PropertyEditorSupport() {
-            @Override
-            public void setAsText(String text) {
-                setValue(DateUtils.parseDate(text));
-            }
-        });
-    }
-
-    /**
-     * 设置请求分页数据
-     */
-    protected void startPage() {
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Integer pageNum = pageDomain.getPageNum();
-        Integer pageSize = pageDomain.getPageSize();
-        if (Objects.nonNull(pageNum) && Objects.nonNull(pageSize)) {
-            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
-            PageHelper.startPage(pageNum, pageSize, orderBy);
-        }
-    }
-
-    /**
-     * 响应请求分页数据
-     */
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    protected TableDataInfo getDataTable(List<?> list) {
-        TableDataInfo rspData = new TableDataInfo();
-        rspData.setCode(HttpStatus.OK.value());
-        rspData.setRows(list);
-        rspData.setMsg("查询成功");
-        rspData.setTotal(new PageInfo(list).getTotal());
-        return rspData;
-    }
-
-    /**
-     * 响应返回结果
-     *
-     * @param rows 影响行数
-     * @return 操作结果
-     */
-    protected ApiResult<Void> toAjax(int rows) {
-        return rows > 0 ? ApiResult.success() : ApiResult.error(BusinessErrorCode.BIZ_MODIFY_FAIL.getCode(), BusinessErrorCode.BIZ_MODIFY_FAIL.getDefaultMessage());
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysConfigController.java

@@ -1,106 +0,0 @@
-package com.usky.system.controller.web;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.common.security.utils.SecurityUtils;
-import com.usky.system.controller.web.page.TableDataInfo;
-import com.usky.system.domain.SysConfig;
-import com.usky.system.domain.constants.UserConstants;
-import com.usky.system.service.ISysConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-
-/**
- * 参数配置 信息操作处理
- * 
- * @author yq
- */
-@RestController
-@RequestMapping("/config")
-public class SysConfigController extends BaseController
-{
-    @Autowired
-    private ISysConfigService configService;
-
-    /**
-     * 获取参数配置列表
-     */
-    @GetMapping("/list")
-    public ApiResult<TableDataInfo> list(SysConfig config)
-    {
-        startPage();
-        List<SysConfig> list = configService.selectConfigList(config);
-        return ApiResult.success(getDataTable(list));
-    }
-
-    /**
-     * 根据参数编号获取详细信息
-     */
-    @GetMapping(value = "/{configId}")
-    public ApiResult getInfo(@PathVariable Long configId)
-    {
-        return ApiResult.success(configService.selectConfigById(configId));
-    }
-
-    /**
-     * 根据参数键名查询参数值
-     */
-    @GetMapping(value = "/configKey/{configKey}")
-    public ApiResult getConfigKey(@PathVariable String configKey)
-    {
-        return ApiResult.success(configService.selectConfigByKey(configKey));
-    }
-
-    /**
-     * 新增参数配置
-     */
-    @PostMapping
-    public ApiResult add(@Validated @RequestBody SysConfig config)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
-        }
-        config.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(configService.insertConfig(config));
-    }
-
-    /**
-     * 修改参数配置
-     */
-    @PutMapping
-    public ApiResult edit(@Validated @RequestBody SysConfig config)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
-        }
-        config.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(configService.updateConfig(config));
-    }
-
-    /**
-     * 删除参数配置
-     */
-    @DeleteMapping("/{configIds}")
-    public ApiResult remove(@PathVariable Long[] configIds)
-    {
-        configService.deleteConfigByIds(configIds);
-        return ApiResult.success();
-    }
-
-    /**
-     * 刷新参数缓存
-     */
-    @DeleteMapping("/refreshCache")
-    public ApiResult refreshCache()
-    {
-        configService.resetConfigCache();
-        return ApiResult.success();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysDeptController.java

@@ -1,150 +0,0 @@
-package com.usky.system.controller.web;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.common.core.util.StringUtils;
-import com.usky.common.security.utils.SecurityUtils;
-import com.usky.system.domain.SysDept;
-import com.usky.system.domain.constants.UserConstants;
-import com.usky.system.service.ISysDeptService;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 部门信息
- * 
- * @author yq
- */
-@RestController
-@RequestMapping("/dept")
-public class SysDeptController extends BaseController
-{
-    @Autowired
-    private ISysDeptService deptService;
-
-    /**
-     * 获取部门列表
-     */
-    @GetMapping("/list")
-    public ApiResult list(SysDept dept)
-    {
-        List<SysDept> depts = deptService.selectDeptList(dept);
-        return ApiResult.success(depts);
-    }
-
-    /**
-     * 查询部门列表（排除节点）
-     */
-    @GetMapping("/list/exclude/{deptId}")
-    public ApiResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
-    {
-        List<SysDept> depts = deptService.selectDeptList(new SysDept());
-        Iterator<SysDept> it = depts.iterator();
-        while (it.hasNext())
-        {
-            SysDept d = (SysDept) it.next();
-            if (d.getDeptId().intValue() == deptId
-                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
-            {
-                it.remove();
-            }
-        }
-        return ApiResult.success(depts);
-    }
-
-    /**
-     * 根据部门编号获取详细信息
-     */
-    @GetMapping(value = "/{deptId}")
-    public ApiResult getInfo(@PathVariable Long deptId)
-    {
-        return ApiResult.success(deptService.selectDeptById(deptId));
-    }
-
-    /**
-     * 获取部门下拉树列表
-     */
-    @GetMapping("/treeselect")
-    public ApiResult treeselect(SysDept dept)
-    {
-        List<SysDept> depts = deptService.selectDeptList(dept);
-        return ApiResult.success(deptService.buildDeptTreeSelect(depts));
-    }
-
-    /**
-     * 加载对应角色部门列表树
-     */
-    @GetMapping(value = "/roleDeptTreeselect/{roleId}")
-    public ApiResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
-    {
-        List<SysDept> depts = deptService.selectDeptList(new SysDept());
-        Map<String,Object> ajax = new HashMap<>();
-        ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
-        ajax.put("depts", deptService.buildDeptTreeSelect(depts));
-        return ApiResult.success(ajax);
-    }
-
-    /**
-     * 新增部门
-     */
-    @PostMapping
-    public ApiResult add(@Validated @RequestBody SysDept dept)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        }
-        dept.setTenantId(SecurityUtils.getTenantId());
-        dept.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(deptService.insertDept(dept));
-    }
-
-    /**
-     * 修改部门
-     */
-    @PutMapping
-    public ApiResult edit(@Validated @RequestBody SysDept dept)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        }
-        else if (dept.getParentId().equals(dept.getDeptId()))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
-        }
-        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
-                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "该部门包含未停用的子部门！");
-        }
-        dept.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(deptService.updateDept(dept));
-    }
-
-    /**
-     * 删除部门
-     */
-    @DeleteMapping("/{deptId}")
-    public ApiResult remove(@PathVariable Long deptId)
-    {
-        if (deptService.hasChildByDeptId(deptId))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "存在下级部门,不允许删除");
-        }
-        if (deptService.checkDeptExistUser(deptId))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "部门存在用户,不允许删除");
-        }
-        return toAjax(deptService.deleteDeptById(deptId));
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysDictDataController.java

@@ -1,94 +0,0 @@
-package com.usky.system.controller.web;
-
-
-import com.usky.common.security.utils.SecurityUtils;
-import com.usky.common.core.bean.ApiResult;
-import com.usky.system.controller.web.page.TableDataInfo;
-import com.usky.system.domain.SysDictData;
-import com.usky.system.service.ISysDictDataService;
-import com.usky.system.service.ISysDictTypeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-
-/**
- * 数据字典信息
- * 
- * @author yq
- */
-@RestController
-@RequestMapping("/dict/data")
-public class SysDictDataController extends BaseController
-{
-    @Autowired
-    private ISysDictDataService dictDataService;
-
-    @Autowired
-    private ISysDictTypeService dictTypeService;
-
-    @GetMapping("/list")
-    public ApiResult<TableDataInfo> list(SysDictData dictData)
-    {
-        startPage();
-        List<SysDictData> list = dictDataService.selectDictDataList(dictData);
-        return ApiResult.success(getDataTable(list));
-    }
-
-    /**
-     * 查询字典数据详细
-     */
-    @GetMapping(value = "/{dictCode}")
-    public ApiResult getInfo(@PathVariable Long dictCode)
-    {
-        return ApiResult.success(dictDataService.selectDictDataById(dictCode));
-    }
-
-    /**
-     * 根据字典类型查询字典数据信息
-     */
-    @GetMapping(value = "/type/{dictType}")
-    public ApiResult dictType(@PathVariable String dictType)
-    {
-        List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
-        if (Objects.isNull(data))
-        {
-            data = new ArrayList<SysDictData>();
-        }
-        return ApiResult.success(data);
-    }
-
-    /**
-     * 新增字典类型
-     */
-    @PostMapping
-    public ApiResult add(@Validated @RequestBody SysDictData dict)
-    {
-        dict.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(dictDataService.insertDictData(dict));
-    }
-
-    /**
-     * 修改保存字典类型
-     */
-    @PutMapping
-    public ApiResult edit(@Validated @RequestBody SysDictData dict)
-    {
-        dict.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(dictDataService.updateDictData(dict));
-    }
-
-    /**
-     * 删除字典类型
-     */
-    @DeleteMapping("/{dictCodes}")
-    public ApiResult remove(@PathVariable Long[] dictCodes)
-    {
-        dictDataService.deleteDictDataByIds(dictCodes);
-        return ApiResult.success();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysDictTypeController.java

@@ -1,105 +0,0 @@
-package com.usky.system.controller.web;
-
-
-import com.usky.common.security.utils.SecurityUtils;
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.system.controller.web.page.TableDataInfo;
-import com.usky.system.domain.SysDictType;
-import com.usky.system.domain.constants.UserConstants;
-import com.usky.system.service.ISysDictTypeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 数据字典信息
- * 
- * @author yq
- */
-@RestController
-@RequestMapping("/dict/type")
-public class SysDictTypeController extends BaseController
-{
-    @Autowired
-    private ISysDictTypeService dictTypeService;
-
-
-    @GetMapping("/list")
-    public ApiResult<TableDataInfo> list(SysDictType dictType)
-    {
-        startPage();
-        List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
-        return ApiResult.success(getDataTable(list));
-    }
-
-    /**
-     * 查询字典类型详细
-     */
-    @GetMapping(value = "/{dictId}")
-    public ApiResult getInfo(@PathVariable Long dictId)
-    {
-        return ApiResult.success(dictTypeService.selectDictTypeById(dictId));
-    }
-
-    /**
-     * 新增字典类型
-     */
-    @PostMapping
-    public ApiResult add(@Validated @RequestBody SysDictType dict)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
-        }
-        dict.setTenantId(SecurityUtils.getTenantId());
-        dict.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(dictTypeService.insertDictType(dict));
-    }
-
-    /**
-     * 修改字典类型
-     */
-    @PutMapping
-    public ApiResult edit(@Validated @RequestBody SysDictType dict)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(dictTypeService.checkDictTypeUnique(dict)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
-        }
-
-        return toAjax(dictTypeService.updateDictType(dict));
-    }
-
-    /**
-     * 删除字典类型
-     */
-    @DeleteMapping("/{dictIds}")
-    public ApiResult remove(@PathVariable Long[] dictIds)
-    {
-        dictTypeService.deleteDictTypeByIds(dictIds);
-        return ApiResult.success();
-    }
-
-    /**
-     * 刷新字典缓存
-     */
-    @DeleteMapping("/refreshCache")
-    public ApiResult refreshCache()
-    {
-        dictTypeService.resetDictCache();
-        return ApiResult.success();
-    }
-
-    /**
-     * 获取字典选择框列表
-     */
-    @GetMapping("/optionselect")
-    public ApiResult optionselect()
-    {
-        List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
-        return ApiResult.success(dictTypes);
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysLogininforController.java

@@ -1,56 +0,0 @@
-package com.usky.system.controller.web;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.system.controller.web.page.TableDataInfo;
-import com.usky.system.domain.SysLogininfor;
-import com.usky.system.service.ISysLogininforService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 系统访问记录
- * 
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/logininfor")
-public class SysLogininforController extends BaseController
-{
-    @Autowired
-    private ISysLogininforService logininforService;
-
-
-    @GetMapping("/list")
-    public ApiResult<TableDataInfo> list(SysLogininfor logininfor)
-    {
-        startPage();
-        List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
-        return ApiResult.success(getDataTable(list));
-    }
-
-
-
-    @DeleteMapping("/{infoIds}")
-    public ApiResult<Void> remove(@PathVariable Long[] infoIds)
-    {
-        return toAjax(logininforService.deleteLogininforByIds(infoIds));
-    }
-
-
-    @DeleteMapping("/clean")
-    public ApiResult<Void> clean()
-    {
-        logininforService.cleanLogininfor();
-        return ApiResult.success();
-    }
-
-    @PostMapping
-    public ApiResult<Void> add(@RequestBody SysLogininfor logininfor)
-    {
-        logininforService.insertLogininfor(logininfor);
-        return ApiResult.success();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysMenuController.java

@@ -1,170 +0,0 @@
-package com.usky.system.controller.web;
-
-
-import com.usky.common.core.util.ServletUtils;
-import com.usky.common.security.service.TokenService;
-import com.usky.common.security.utils.SecurityUtils;
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.constants.CommonConst;
-import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.common.core.util.StringUtils;
-import com.usky.system.domain.SysMenu;
-import com.usky.system.domain.SysUser;
-import com.usky.system.domain.constants.UserConstants;
-import com.usky.system.model.LoginUser;
-import com.usky.system.service.ISysMenuService;
-import com.usky.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 菜单信息
- * 
- * @author yq
- */
-@RestController
-@RequestMapping("/menu")
-public class SysMenuController extends BaseController
-{
-    @Autowired
-    private ISysMenuService menuService;
-
-    @Autowired
-    private ISysUserService userService;
-
-    @Autowired
-    private TokenService tokenService;
-
-    /**
-     * 获取菜单列表
-     */
-    @GetMapping("/list")
-    public ApiResult list(SysMenu menu)
-    {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getUserid();
-        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
-        return ApiResult.success(menus);
-    }
-
-    /**
-     * 根据菜单编号获取详细信息
-     */
-    @GetMapping(value = "/{menuId}")
-    public ApiResult getInfo(@PathVariable Long menuId)
-    {
-        return ApiResult.success(menuService.selectMenuById(menuId));
-    }
-
-    /**
-     * 获取菜单下拉树列表
-     */
-    @GetMapping("/treeselect")
-    public ApiResult treeselect(SysMenu menu)
-    {
-        Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
-        return ApiResult.success(menuService.buildMenuTreeSelect(menus));
-    }
-
-    /**
-     * 加载对应角色菜单列表树
-     */
-    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
-    public ApiResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
-    {
-        Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuList(userId);
-        Map<String,Object> ajax = new HashMap<>();
-        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
-        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
-        return ApiResult.success(ajax);
-    }
-
-    /**
-     * 新增菜单
-     */
-    @PostMapping
-    public ApiResult add(@Validated @RequestBody SysMenu menu)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
-        }
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
-        && !StringUtils.startsWithAny(menu.getPath(), CommonConst.HTTP_PREFIX, CommonConst.HTTPS_PREFIX))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
-        }
-        menu.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(menuService.insertMenu(menu));
-    }
-
-    /**
-     * 修改菜单
-     */
-    @PutMapping
-    public ApiResult edit(@Validated @RequestBody SysMenu menu)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
-        }
-        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame())
-        && !StringUtils.startsWithAny(menu.getPath(), CommonConst.HTTP_PREFIX, CommonConst.HTTPS_PREFIX))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
-        }
-        else if (menu.getMenuId().equals(menu.getParentId()))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
-        }
-        menu.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(menuService.updateMenu(menu));
-    }
-
-    /**
-     * 删除菜单
-     */
-    @DeleteMapping("/{menuId}")
-    public ApiResult remove(@PathVariable("menuId") Long menuId)
-    {
-        if (menuService.hasChildByMenuId(menuId))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "存在子菜单,不允许删除");
-        }
-        if (menuService.checkMenuExistRole(menuId))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "菜单已分配,不允许删除");
-        }
-        return toAjax(menuService.deleteMenuById(menuId));
-    }
-
-
-    /**
-     * 获取路由信息
-     *
-     * @return 路由信息
-     */
-    @GetMapping("getRouters")
-    public ApiResult getRouters()
-    {
-        Long userId = SecurityUtils.getUserId();
-
-        SysUser sysUser = userService.selectUserById(userId);
-        List<SysMenu> menus = new ArrayList<>();
-        if ("01".equals(sysUser.getUserType())){
-            menus = menuService.selectMenuTreeByUserIdOne(SecurityUtils.getTenantId());
-        }else {
-            menus = menuService.selectMenuTreeByUserId(userId);
-        }
-        return ApiResult.success(menuService.buildMenus(menus));
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysNoticeController.java

@@ -1,77 +0,0 @@
-package com.usky.system.controller.web;
-
-import com.usky.common.security.annotation.RequiresPermissions;
-import com.usky.common.security.utils.SecurityUtils;
-import com.usky.common.core.bean.ApiResult;
-import com.usky.system.controller.web.page.TableDataInfo;
-import com.usky.system.domain.SysNotice;
-import com.usky.system.service.ISysNoticeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 公告 信息操作处理
- * 
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/notice")
-public class SysNoticeController extends BaseController
-{
-    @Autowired
-    private ISysNoticeService noticeService;
-
-    /**
-     * 获取通知公告列表
-     */
-    @RequiresPermissions("system:notice:list")
-    @GetMapping("/list")
-    public ApiResult<TableDataInfo> list(SysNotice notice)
-    {
-        startPage();
-        List<SysNotice> list = noticeService.selectNoticeList(notice);
-        return ApiResult.success(getDataTable(list));
-    }
-
-    /**
-     * 根据通知公告编号获取详细信息
-     */
-    @RequiresPermissions("system:notice:query")
-    @GetMapping(value = "/{noticeId}")
-    public ApiResult getInfo(@PathVariable Long noticeId)
-    {
-        return ApiResult.success(noticeService.selectNoticeById(noticeId));
-    }
-
-    /**
-     * 新增通知公告
-     */
-    @PostMapping
-    public ApiResult add(@Validated @RequestBody SysNotice notice)
-    {
-        notice.setCreateBy(SecurityUtils.getUsername());
-        return ApiResult.success(toAjax(noticeService.insertNotice(notice)));
-    }
-
-    /**
-     * 修改通知公告
-     */
-    @PutMapping
-    public ApiResult edit(@Validated @RequestBody SysNotice notice)
-    {
-        notice.setUpdateBy(SecurityUtils.getUsername());
-        return ApiResult.success(toAjax(noticeService.updateNotice(notice)));
-    }
-
-    /**
-     * 删除通知公告
-     */
-    @DeleteMapping("/{noticeIds}")
-    public ApiResult remove(@PathVariable Long[] noticeIds)
-    {
-        return ApiResult.success(toAjax(noticeService.deleteNoticeByIds(noticeIds)));
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysOperlogController.java

@@ -1,54 +0,0 @@
-package com.usky.system.controller.web;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.system.controller.web.page.TableDataInfo;
-import com.usky.system.domain.SysOperLog;
-import com.usky.system.service.ISysOperLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 操作日志记录
- * 
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/operlog")
-public class SysOperlogController extends BaseController
-{
-    @Autowired
-    private ISysOperLogService operLogService;
-
-    @GetMapping("/list")
-    public ApiResult<TableDataInfo> list(SysOperLog operLog)
-    {
-        startPage();
-        List<SysOperLog> list = operLogService.selectOperLogList(operLog);
-        return ApiResult.success(getDataTable(list));
-    }
-
-
-    @DeleteMapping("/{operIds}")
-    public ApiResult<Void> remove(@PathVariable Long[] operIds)
-    {
-        return toAjax(operLogService.deleteOperLogByIds(operIds));
-    }
-
-
-    @DeleteMapping("/clean")
-    public ApiResult<Void> clean()
-    {
-        operLogService.cleanOperLog();
-        return ApiResult.success();
-    }
-
-    @PostMapping
-    public ApiResult<Void> add(@RequestBody SysOperLog operLog)
-    {
-        operLogService.insertOperlog(operLog);
-        return ApiResult.success();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysPlatformController.java

@@ -1,86 +0,0 @@
-package com.usky.system.controller.web;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.bean.CommonPage;
-import com.usky.common.security.utils.SecurityUtils;
-import com.usky.system.domain.SysMenu;
-import com.usky.system.service.ISysMenuService;
-import com.usky.system.service.SysPlatformService;
-import com.usky.system.service.vo.PlatformMenuVo;
-import com.usky.system.service.vo.SysPlatformVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 平台管理
- *
- * @author ya
- * @since 2022-05-18
- */
-@RestController
-@RequestMapping("/sysPlatform")
-public class SysPlatformController {
-    @Autowired
-    private SysPlatformService sysPlatformService;
-
-    @Autowired
-    private ISysMenuService menuService;
-
-    /**
-     * 平台挂管理-列表查询
-     *
-     * @param platformName 平台名称
-     * @param startTime    开始时间
-     * @param endTime      结束时间
-     * @param page         当前页
-     * @param size         每页条数
-     * @param id           平台ID
-     * @return
-     */
-    @GetMapping("/getPlatformList")
-    public ApiResult<CommonPage<SysPlatformVo>> getPlatformList(@RequestParam(value = "platformName", required = false) String platformName,
-                                                                @RequestParam(value = "startTime", required = false) String startTime,
-                                                                @RequestParam(value = "endTime", required = false) String endTime,
-                                                                @RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
-                                                                @RequestParam(value = "size", required = false, defaultValue = "0") Integer size,
-                                                                @RequestParam(value = "id", required = false, defaultValue = "0") Integer id) {
-        return ApiResult.success(sysPlatformService.getPlatformList(platformName, startTime, endTime, page, size, id));
-    }
-
-    /**
-     * 平台挂管理-菜单查询
-     *
-     * @param platformId 平台ID
-     * @return
-     */
-    @GetMapping("/getPlatformMenu")
-    public ApiResult<Map<String, Object>> getPlatformMenu(@RequestParam Long platformId) {
-
-        Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuList(userId);
-        Map<String,Object> ajax = new HashMap<>();
-        ajax.put("checkedKeys", sysPlatformService.getPlatformMenu(platformId));
-        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
-        return ApiResult.success(ajax);
-    }
-
-
-    /**
-     * 平台挂管理-菜单编辑
-     *
-     * @param platformMenuVo
-     * @return
-     */
-//    @Log(title = "平台挂管理", businessType = BusinessType.INSERT)
-    @PostMapping("updatePlatformMenu")
-    public ApiResult<Void> updatePlatformMenu(@RequestBody PlatformMenuVo platformMenuVo) {
-        sysPlatformService.updatePlatformMenu(platformMenuVo);
-        return ApiResult.success();
-    }
-}
-

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysPostController.java

@@ -1,106 +0,0 @@
-package com.usky.system.controller.web;
-
-
-import com.usky.common.security.utils.SecurityUtils;
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.system.controller.web.page.TableDataInfo;
-import com.usky.system.domain.SysPost;
-import com.usky.system.domain.constants.UserConstants;
-import com.usky.system.service.ISysPostService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-
-/**
- * 岗位信息操作处理
- * 
- * @author yq
- */
-@RestController
-@RequestMapping("/post")
-public class SysPostController extends BaseController
-{
-    @Autowired
-    private ISysPostService postService;
-
-    /**
-     * 获取岗位列表
-     */
-    @GetMapping("/list")
-    public ApiResult<TableDataInfo> list(SysPost post)
-    {
-        startPage();
-        List<SysPost> list = postService.selectPostList(post);
-        return ApiResult.success(getDataTable(list));
-    }
-
-    /**
-     * 根据岗位编号获取详细信息
-     */
-    @GetMapping(value = "/{postId}")
-    public ApiResult getInfo(@PathVariable Long postId)
-    {
-        return ApiResult.success(postService.selectPostById(postId));
-    }
-
-    /**
-     * 新增岗位
-     */
-    @PostMapping
-    public ApiResult add(@Validated @RequestBody SysPost post)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
-        }
-        post.setTenantId(SecurityUtils.getTenantId());
-        post.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(postService.insertPost(post));
-    }
-
-    /**
-     * 修改岗位
-     */
-//    @PreAuthorize("@ss.hasPermi('system:post:edit')")
-    @PutMapping
-    public ApiResult edit(@Validated @RequestBody SysPost post)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(postService.checkPostNameUnique(post)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(postService.checkPostCodeUnique(post)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
-        }
-        post.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(postService.updatePost(post));
-    }
-
-    /**
-     * 删除岗位
-     */
-    @DeleteMapping("/{postIds}")
-    public ApiResult remove(@PathVariable Long[] postIds)
-    {
-        return toAjax(postService.deletePostByIds(postIds));
-    }
-
-    /**
-     * 获取岗位选择框列表
-     */
-    @GetMapping("/optionselect")
-    public ApiResult optionselect()
-    {
-        List<SysPost> posts = postService.selectPostAll();
-        return ApiResult.success(posts);
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysRoleController.java

@@ -1,183 +0,0 @@
-package com.usky.system.controller.web;
-
-
-import com.usky.common.security.utils.SecurityUtils;
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.system.controller.web.page.TableDataInfo;
-import com.usky.system.domain.SysRole;
-import com.usky.system.domain.SysUser;
-import com.usky.system.domain.SysUserRole;
-import com.usky.system.domain.constants.UserConstants;
-import com.usky.system.service.ISysRoleService;
-import com.usky.system.service.ISysUserService;
-import com.usky.system.service.impl.SysPermissionService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-
-/**
- * 角色信息
- * 
- * @author yq
- */
-@RestController
-@RequestMapping("/role")
-public class SysRoleController extends BaseController
-{
-    @Autowired
-    private ISysRoleService roleService;
-    
-    @Autowired
-    private SysPermissionService permissionService;
-    
-    @Autowired
-    private ISysUserService userService;
-
-    @GetMapping("/list")
-    public ApiResult<TableDataInfo> list(SysRole role)
-    {
-        startPage();
-        List<SysRole> list = roleService.selectRoleList(role);
-        return ApiResult.success(getDataTable(list));
-    }
-
-    /**
-     * 根据角色编号获取详细信息
-     */
-    @GetMapping(value = "/{roleId}")
-    public ApiResult getInfo(@PathVariable Long roleId)
-    {
-        return ApiResult.success(roleService.selectRoleById(roleId));
-    }
-
-    /**
-     * 新增角色
-     */
-    @PostMapping
-    public ApiResult add(@Validated @RequestBody SysRole role)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
-        }
-        role.setTenantId(SecurityUtils.getTenantId());
-        role.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(roleService.insertRole(role));
-
-    }
-
-    /**
-     * 修改保存角色
-     */
-    @PutMapping
-    public ApiResult edit(@Validated @RequestBody SysRole role)
-    {
-        roleService.checkRoleAllowed(role);
-        if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
-        }
-        else if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleKeyUnique(role)))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
-        }
-        role.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(roleService.updateRole(role));
-    }
-
-    /**
-     * 修改保存数据权限
-     */
-    @PutMapping("/dataScope")
-    public ApiResult dataScope(@RequestBody SysRole role)
-    {
-        roleService.checkRoleAllowed(role);
-        return toAjax(roleService.authDataScope(role));
-    }
-
-    /**
-     * 状态修改
-     */
-    @PutMapping("/changeStatus")
-    public ApiResult changeStatus(@RequestBody SysRole role)
-    {
-        roleService.checkRoleAllowed(role);
-        role.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(roleService.updateRoleStatus(role));
-    }
-
-    /**
-     * 删除角色
-     */
-    @DeleteMapping("/{roleIds}")
-    public ApiResult remove(@PathVariable Long[] roleIds)
-    {
-        return toAjax(roleService.deleteRoleByIds(roleIds));
-    }
-
-    /**
-     * 获取角色选择框列表
-     */
-    @GetMapping("/optionselect")
-    public ApiResult optionselect()
-    {
-        return ApiResult.success(roleService.selectRoleAll());
-    }
-
-    /**
-     * 查询已分配用户角色列表
-     */
-    @GetMapping("/authUser/allocatedList")
-    public ApiResult<TableDataInfo> allocatedList(SysUser user)
-    {
-        startPage();
-        List<SysUser> list = userService.selectAllocatedList(user);
-        return ApiResult.success(getDataTable(list));
-    }
-
-    /**
-     * 查询未分配用户角色列表
-     */
-    @GetMapping("/authUser/unallocatedList")
-    public ApiResult<TableDataInfo> unallocatedList(SysUser user)
-    {
-        startPage();
-        List<SysUser> list = userService.selectUnallocatedList(user);
-        return ApiResult.success(getDataTable(list));
-    }
-
-    /**
-     * 取消授权用户
-     */
-    @PutMapping("/authUser/cancel")
-    public ApiResult cancelAuthUser(@RequestBody SysUserRole userRole)
-    {
-        return toAjax(roleService.deleteAuthUser(userRole));
-    }
-
-    /**
-     * 批量取消授权用户
-     */
-    @PutMapping("/authUser/cancelAll")
-    public ApiResult cancelAuthUserAll(Long roleId, Long[] userIds)
-    {
-        return toAjax(roleService.deleteAuthUsers(roleId, userIds));
-    }
-
-    /**
-     * 批量选择用户授权
-     */
-    @PutMapping("/authUser/selectAll")
-    public ApiResult selectAuthUserAll(Long roleId, Long[] userIds)
-    {
-        return toAjax(roleService.insertAuthUsers(roleId, userIds));
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysTenantConfigController.java

@@ -1,131 +0,0 @@
-package com.usky.system.controller.web;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.bean.CommonPage;
-import com.usky.system.domain.SysMenu;
-import com.usky.system.domain.SysTenantConfig;
-import com.usky.system.service.SysTenantConfigService;
-import com.usky.system.service.SysTenantService;
-import com.usky.system.service.vo.SysTenantConfigVo;
-import com.usky.system.service.vo.SysTenantOneVo;
-import com.usky.system.service.vo.SysTenantTwoVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * 登录中间页配置
- *
- * @author ya
- * @since 2022-05-06
- */
-@RestController
-@RequestMapping("/sysTenantConfig")
-public class SysTenantConfigController {
-    @Autowired
-    private SysTenantConfigService sysTenantConfigService;
-
-    @Autowired
-    private SysTenantService sysTenantService;
-
-
-    /**
-     * 登录页-样式配置查询
-     *
-     * @param url 域名
-     * @return
-     */
-    @GetMapping("/getTenantConfig")
-    public ApiResult<List<SysTenantConfigVo>> getTenantConfig(@RequestParam String url) {
-        return ApiResult.success(sysTenantConfigService.getTenantConfig(url));
-    }
-
-
-    /**
-     * 中间页-样式配置查询
-     */
-    @GetMapping("/getMiddleConfig")
-    public ApiResult<List<SysTenantConfig>> getMiddleConfig() {
-        return ApiResult.success(sysTenantConfigService.getMiddleConfig());
-    }
-
-
-    /**
-     * 租户管理-系统配置-主列表查询
-     *
-     * @param sysTenantOneVo
-     * @return
-     */
-    @PostMapping("getTenantData")
-    public ApiResult<CommonPage<SysTenantTwoVo>> getTenantData(@RequestBody SysTenantOneVo sysTenantOneVo) {
-        return ApiResult.success(sysTenantService.getTenantData(sysTenantOneVo));
-    }
-
-    /**
-     * 租户管理-系统配置-租户配置查询
-     *
-     * @param tenantId 租户ID
-     * @return
-     */
-    @GetMapping("/getMiddleConfigList")
-    public ApiResult<List<SysTenantConfig>> getMiddleConfigList(@RequestParam Integer tenantId) {
-        return ApiResult.success(sysTenantConfigService.getMiddleConfigList(tenantId));
-    }
-
-    /**
-     * 租户管理-系统配置-租户配置新增
-     *
-     * @param sysTenantConfig
-     * @return
-     */
-//    @Log(title = "租户管理-系统配置", businessType = BusinessType.INSERT)
-    @PostMapping("addMiddleConfig")
-    public ApiResult<Void> addMiddleConfig(@RequestBody SysTenantConfig sysTenantConfig) {
-        sysTenantConfigService.addMiddleConfig(sysTenantConfig);
-        return ApiResult.success();
-    }
-
-    /**
-     * 租户管理-系统配置-租户配置修改
-     *
-     * @param sysTenantConfig
-     * @return
-     */
-//    @Log(title = "租户管理-系统配置", businessType = BusinessType.UPDATE)
-    @PostMapping("updaMiddleConfig")
-    public ApiResult<Void> updaMiddleConfig(@RequestBody SysTenantConfig sysTenantConfig) {
-        sysTenantConfigService.updaMiddleConfig(sysTenantConfig);
-        return ApiResult.success();
-    }
-
-    /**
-     * 租户管理-系统配置-图片上传
-     *
-     * @param file    图片
-     * @param request
-     * @return
-     */
-    @PostMapping("pictureUpload")
-    public ApiResult<String> pictureUpload(@RequestParam(value = "file", required = false) MultipartFile file, HttpServletRequest request
-    ) {
-        return ApiResult.success(sysTenantConfigService.pictureUpload(file, request));
-    }
-
-
-    /**
-     * 租户管理-系统配置-首页请求地址下拉框查询
-     *
-     * @param tenantId 租户ID
-     * @return
-     */
-    @GetMapping("/getMenuBoxList")
-    public ApiResult<List<SysMenu>> getMenuBoxList(@RequestParam Integer tenantId) {
-        return ApiResult.success(sysTenantConfigService.getMenuBoxList(tenantId));
-    }
-
-}
-

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysUserController.java

@@ -1,163 +0,0 @@
-package com.usky.system.controller.web;
-
-
-import com.usky.common.security.utils.SecurityUtils;
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.system.controller.web.page.TableDataInfo;
-import com.usky.system.domain.SysRole;
-import com.usky.system.domain.SysUser;
-import com.usky.system.domain.constants.UserConstants;
-import com.usky.system.service.ISysPostService;
-import com.usky.system.service.ISysRoleService;
-import com.usky.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * 用户信息
- * 
- * @author yq
- */
-@RestController
-@RequestMapping("/user")
-public class SysUserController extends BaseController
-{
-    @Autowired
-    private ISysUserService userService;
-
-    @Autowired
-    private ISysRoleService roleService;
-
-    @Autowired
-    private ISysPostService postService;
-
-    /**
-     * 获取用户列表
-     */
-//    @Log(title = "用户管理", businessType = BusinessType.OTHER)
-    @GetMapping("/list")
-    public ApiResult<TableDataInfo> list(SysUser user)
-    {
-        startPage();
-        List<SysUser> list = userService.selectUserList(user);
-        return ApiResult.success(getDataTable(list));
-    }
-
-    /**
-     * 根据用户编号获取详细信息
-     */
-    @GetMapping(value = { "/", "/{userId}" })
-    public ApiResult<Map<String,Object>> getInfo(@PathVariable(value = "userId", required = false) Long userId)
-    {
-        Map<String,Object> ajax = new HashMap<>();
-        List<SysRole> roles = roleService.selectRoleAll();
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        ajax.put("posts", postService.selectPostAll());
-        if (Objects.nonNull(userId))
-        {
-            ajax.put("data", userService.selectUserById(userId));
-            ajax.put("postIds", postService.selectPostListByUserId(userId));
-            ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
-        }
-        return ApiResult.success(ajax);
-    }
-
-    /**
-     * 新增用户
-     */
-//    @Log(title = "用户管理", businessType = BusinessType.INSERT)
-    @Transactional
-    @PostMapping
-    public ApiResult<Void> add(@Validated @RequestBody SysUser user)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName(),SecurityUtils.getTenantId())))
-        {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        }
-        user.setUserType("00");
-        user.setTenantId(SecurityUtils.getTenantId());
-        user.setCreateBy(SecurityUtils.getUsername());
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        int row = userService.insertUser(user);
-        return toAjax(row);
-    }
-
-    /**
-     * 修改用户
-     */
-//    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
-    @Transactional
-    @PutMapping
-    public ApiResult<Void> edit(@Validated @RequestBody SysUser user)
-    {
-        userService.checkUserAllowed(user);
-        user.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(userService.updateUser(user));
-    }
-
-    /**
-     * 删除用户
-     */
-//    @Log(title = "用户管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{userIds}")
-    public ApiResult<Void> remove(@PathVariable Long[] userIds)
-    {
-        return toAjax(userService.deleteUserByIds(userIds));
-    }
-
-    /**
-     * 重置密码
-     */
-    @PutMapping("/resetPwd")
-    public ApiResult<Void> resetPwd(@RequestBody SysUser user)
-    {
-        userService.checkUserAllowed(user);
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        user.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(userService.resetPwd(user));
-    }
-
-    /**
-     * 状态修改
-     */
-    @PutMapping("/changeStatus")
-    public ApiResult<Void> changeStatus(@RequestBody SysUser user)
-    {
-        userService.checkUserAllowed(user);
-        user.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(userService.updateUserStatus(user));
-    }
-
-    /**
-     * 根据用户编号获取授权角色
-     */
-    @GetMapping("/authRole/{userId}")
-    public ApiResult<Map<String,Object>> authRole(@PathVariable("userId") Long userId)
-    {
-        Map<String,Object> ajax = new HashMap<>();
-        SysUser user = userService.selectUserById(userId);
-        List<SysRole> roles = roleService.selectRolesByUserId(userId);
-        ajax.put("user", user);
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        return ApiResult.success(ajax);
-    }
-
-    /**
-     * 用户授权角色
-     */
-    @PutMapping("/authRole")
-    public ApiResult<Void> insertAuthRole(Long userId, Long[] roleIds)
-    {
-        userService.insertUserAuth(userId, roleIds);
-        return ApiResult.success();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TenantConfigController.java

@@ -1,84 +0,0 @@
-package com.usky.system.controller.web;
-
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.bean.CommonPage;
-import com.usky.system.domain.SysPlatform;
-import com.usky.system.domain.SysTenant;
-import com.usky.system.service.SysPlatformService;
-import com.usky.system.service.SysTenantService;
-import com.usky.system.service.vo.SysTenantOneVo;
-import com.usky.system.service.vo.SysTenantTwoVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 个人中心
- *
- * @author ya
- * @since 2022-05-05
- */
-@RestController
-@RequestMapping("/tenantConfig")
-public class TenantConfigController {
-
-    @Autowired
-    private SysTenantService sysTenantService;
-
-    @Autowired
-    private SysPlatformService sysPlatformService;
-
-
-    /**
-     * 租户管理-租户单位配置-列表查询
-     *
-     * @param sysTenantOneVo
-     * @return
-     */
-    @PostMapping("getTenantData")
-    public ApiResult<CommonPage<SysTenantTwoVo>> getTenantData(@RequestBody SysTenantOneVo sysTenantOneVo) {
-        return ApiResult.success(sysTenantService.getTenantData(sysTenantOneVo));
-    }
-
-
-    /**
-     * 租户管理-租户单位配置-新增
-     *
-     * @param sysTenant
-     * @return
-     */
-//    @Log(title = "租户管理-单位管理", businessType = BusinessType.INSERT)
-    @PostMapping("addTenantData")
-    public ApiResult<Void> addTenantData(@RequestBody SysTenant sysTenant) {
-        sysTenantService.addTenantData(sysTenant);
-        return ApiResult.success();
-    }
-
-    /**
-     * 租户管理-租户单位配置-修改
-     *
-     * @param sysTenant
-     * @return
-     */
-//    @Log(title = "租户管理-单位管理", businessType = BusinessType.UPDATE)
-    @PostMapping("updateTenantData")
-    public ApiResult<Void> updateTenantData(@RequestBody SysTenant sysTenant) {
-        sysTenantService.updateTenantData(sysTenant);
-        return ApiResult.success();
-    }
-
-
-    /**
-     * 租户管理-租户单位配置-系统平台下拉框数据查询
-     *
-     * @return
-     */
-    @GetMapping("/getPlatformBoxList")
-    public ApiResult<List<SysPlatform>> getPlatformBoxList() {
-        return ApiResult.success(sysPlatformService.getPlatformBoxList());
-    }
-
-}
-

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TestController.java

@@ -1,16 +0,0 @@
-package com.usky.system.controller.web;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author yq
- * @date 2022/6/23 13:12
- */
-@RestController
-@RequestMapping("/test")
-public class TestController {
-
-
-
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/TokenController.java

@@ -1,117 +0,0 @@
-package com.usky.system.controller.web;
-
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.util.JwtUtils;
-import com.usky.common.core.util.StringUtils;
-import com.usky.common.security.auth.AuthUtil;
-import com.usky.common.security.service.TokenService;
-import com.usky.common.security.utils.SecurityUtils;
-import com.usky.system.model.LoginUser;
-import com.usky.system.service.ISysPermissionService;
-import com.usky.system.service.ISysUserService;
-import com.usky.system.service.SysLoginService;
-import com.usky.system.service.vo.LoginBody;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-
-/**
- * token 控制
- *
- * @author ruoyi
- */
-@RestController
-public class TokenController
-{
-    @Autowired
-    private TokenService tokenService;
-
-    @Autowired
-    private SysLoginService sysLoginService;
-
-    @Autowired
-    private ISysUserService sysUserService;
-
-    @Autowired
-    private ISysPermissionService permissionService;
-
-    @PostMapping("login")
-    public ApiResult<?> login(@RequestBody LoginBody form)
-    {
-        // 用户登录
-        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
-        // 获取登录token
-        return ApiResult.success(tokenService.createToken(userInfo));
-    }
-
-    @PostMapping("login1")
-    public ApiResult<?> login1(@RequestBody LoginBody form)
-    {
-        // 用户登录
-        LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
-        // 获取登录token
-        return ApiResult.success(tokenService.createToken(userInfo));
-    }
-
-    @DeleteMapping("logout")
-    public ApiResult<?> logout(HttpServletRequest request)
-    {
-        String token = SecurityUtils.getToken(request);
-        if (StringUtils.isNotEmpty(token))
-        {
-            String username = JwtUtils.getUserName(token);
-            // 删除用户缓存记录
-            AuthUtil.logoutByToken(token);
-            // 记录用户退出日志
-            sysLoginService.logout(username);
-        }
-        return ApiResult.success();
-    }
-
-    @PostMapping("refresh")
-    public ApiResult<?> refresh(HttpServletRequest request)
-    {
-        LoginUser loginUser = tokenService.getLoginUser(request);
-        if (Objects.nonNull(loginUser))
-        {
-            // 刷新令牌有效期
-            tokenService.refreshToken(loginUser);
-            return ApiResult.success();
-        }
-        return ApiResult.success();
-    }
-
-    /**
-     * 获取用户信息
-     *
-     * @return 用户信息
-     */
-    @GetMapping("getInfo")
-    public ApiResult getInfo()
-    {
-        Long userId = SecurityUtils.getUserId();
-        // 角色集合
-        Set<String> roles = permissionService.getRolePermission(userId);
-        // 权限集合
-        Set<String> permissions = permissionService.getMenuPermission(userId);
-        Map<String,Object> ajax = new HashMap<>();
-        ajax.put("user", sysUserService.selectUserById(userId));
-        ajax.put("roles", roles);
-        ajax.put("permissions", permissions);
-        return ApiResult.success(ajax);
-    }
-
-
-//    @PostMapping("register")
-//    public ApiResult<?> register(@RequestBody RegisterBody registerBody)
-//    {
-//        // 用户注册
-//        sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
-//        return ApiResult.success();
-//    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/UserConfigController.java

@@ -1,158 +0,0 @@
-package com.usky.system.controller.web;
-
-import com.usky.common.security.utils.SecurityUtils;
-import com.usky.common.core.bean.ApiResult;
-import com.usky.common.core.bean.CommonPage;
-import com.usky.common.core.exception.BusinessErrorCode;
-import com.usky.system.domain.SysUser;
-import com.usky.system.domain.constants.UserConstants;
-import com.usky.system.service.ISysUserService;
-import com.usky.system.service.SysTenantService;
-import com.usky.system.service.vo.SysTenantTwoVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-
-/**
- * 租户管理-管理员配置
- *
- * @author yq
- */
-@RestController
-@RequestMapping("/userconfig")
-public class UserConfigController extends BaseController {
-    @Autowired
-    private ISysUserService userService;
-
-    @Autowired
-    private SysTenantService sysTenantService;
-
-
-    /**
-     * 租户管理-管理员配置-新增
-     *
-     * @param user
-     * @return
-     */
-//    @Log(title = "租户管理-管理员配置", businessType = BusinessType.INSERT)
-    @Transactional
-    @PostMapping("/addUserData")
-    public ApiResult<Void> addUserData(@Validated @RequestBody SysUser user) {
-        if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(user.getUserName(),user.getTenantId()))) {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        }
-        user.setCreateBy(SecurityUtils.getUsername());
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        user.setCreateTime(new Date());
-        user.setUserType("01");
-        user.setFullName(user.getNickName());
-//        user.setStatus("0");
-        user.setDelFlag("0");
-        int row = userService.addUser(user);
-        return toAjax(row);
-    }
-
-
-    /**
-     * 租户管理-管理员配置-修改
-     *
-     * @param user
-     * @return
-     */
-//    @Log(title = "租户管理-管理员配置", businessType = BusinessType.UPDATE)
-    @Transactional
-    @PostMapping("/updateserData")
-    public ApiResult<Void> updateserData(@Validated @RequestBody SysUser user) {
-        if (!"".equals(user.getPassword())&&null!=user.getPassword()){
-            user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        }
-        user.setUpdateBy(SecurityUtils.getUsername());
-        user.setUpdateTime(new Date());
-        return toAjax(userService.updateUserData(user));
-    }
-
-
-    /**
-     * 租户管理-管理员配置-删除
-     *
-     * @param userId 用户ID
-     * @return
-     */
-//    @Log(title = "租户管理-管理员配置", businessType = BusinessType.DELETE)
-    @GetMapping("/delUsers")
-    public ApiResult<Void> delUsers(@RequestParam Long userId) {
-        SysUser user = new SysUser();
-        if (userId == 0 && userId == null) {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "用户ID不能为空");
-        }
-        user.setUserId(userId);
-        userService.checkUserAllowed(user);
-        user.setUpdateBy(SecurityUtils.getUsername());
-        user.setUpdateTime(new Date());
-        user.setRemark("注销用户");
-        user.setDelFlag("2");
-        return toAjax(userService.updateUserData(user));
-    }
-
-
-    /**
-     * 租户管理-管理员配置-重置密码
-     *
-     * @param newPassword 新密码
-     * @param UserId      用户ID
-     * @return
-     */
-//    @Log(title = "租户管理-管理员配置", businessType = BusinessType.UPDATE)
-    @PutMapping("/updatePwd")
-    public ApiResult updatePwd(String newPassword, Long UserId) {
-        SysUser sysUser = userService.selectUserById(UserId);
-        if (sysUser.getUserId() == 0 && sysUser.getUserId() == null) {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "无此用户，请联系管理员");
-        }
-        if (SecurityUtils.matchesPassword(newPassword, sysUser.getPassword())) {
-            return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新密码不能与旧密码相同");
-        }
-        userService.resetUserPwdOne(UserId, SecurityUtils.encryptPassword(newPassword));
-        return ApiResult.success();
-    }
-
-
-    /**
-     * 租户管理-管理员配置-管理员信息查询
-     *
-     * @param tenantId 租户ID
-     * @param page     当前页
-     * @param size     每页条数
-     * @return
-     */
-    @GetMapping("getUserList")
-    public ApiResult<CommonPage<SysUser>> getUserList(@RequestParam(value = "tenantId", required = false, defaultValue = "0") Integer tenantId,
-                                                      @RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
-                                                      @RequestParam(value = "size", required = false, defaultValue = "0") Integer size,
-                                                      @RequestParam(value = "userId", required = false, defaultValue = "0") long userId) {
-        return ApiResult.success(userService.userList(tenantId, page, size, userId));
-    }
-
-
-    /**
-     * 租户管理-管理员配置-列表查询
-     *
-     * @param tenantName    租户名称
-     * @param tenantManager 租户责任人名称
-     * @param page          当前页
-     * @param size          每页条数
-     * @return
-     */
-    @GetMapping("getTenantDataOne")
-    public ApiResult<CommonPage<SysTenantTwoVo>> getTenantDataOne(@RequestParam(value = "tenantName", required = false) String tenantName,
-                                                                  @RequestParam(value = "tenantManager", required = false) String tenantManager,
-                                                                  @RequestParam(value = "page", required = false, defaultValue = "0") Integer page,
-                                                                  @RequestParam(value = "size", required = false, defaultValue = "0") Integer size) {
-        return ApiResult.success(sysTenantService.getTenantDataOne(tenantName, tenantManager, page, size));
-    }
-
-
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/page/PageDomain.java

@@ -1,68 +0,0 @@
-package com.usky.system.controller.web.page;
-
-
-import com.usky.common.core.util.StringUtils;
-
-/**
- * 分页数据
- */
-public class PageDomain {
-    /**
-     * 当前记录起始索引
-     */
-    private Integer pageNum;
-
-    /**
-     * 每页显示记录数
-     */
-    private Integer pageSize;
-
-    /**
-     * 排序列
-     */
-    private String orderByColumn;
-    /**
-     * 排序的方向 "desc" 或者 "asc".
-     */
-
-    private String isAsc;
-
-    public String getOrderBy() {
-        if (StringUtils.isBlank(orderByColumn)) {
-            return "";
-        }
-        return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc;
-    }
-
-    public Integer getPageNum() {
-        return pageNum;
-    }
-
-    public void setPageNum(Integer pageNum) {
-        this.pageNum = pageNum;
-    }
-
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public String getOrderByColumn() {
-        return orderByColumn;
-    }
-
-    public void setOrderByColumn(String orderByColumn) {
-        this.orderByColumn = orderByColumn;
-    }
-
-    public String getIsAsc() {
-        return isAsc;
-    }
-
-    public void setIsAsc(String isAsc) {
-        this.isAsc = isAsc;
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/page/TableDataInfo.java

@@ -1,80 +0,0 @@
-package com.usky.system.controller.web.page;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 表格分页数据对象
- */
-public class TableDataInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 总记录数
-     */
-    private long total;
-
-    /**
-     * 列表数据
-     */
-    private List<?> rows;
-
-    /**
-     * 消息状态码
-     */
-    private int code;
-
-    /**
-     * 消息内容
-     */
-    private String msg;
-
-    /**
-     * 表格数据对象
-     */
-    public TableDataInfo() {
-    }
-
-    /**
-     * 分页
-     *
-     * @param list  列表数据
-     * @param total 总记录数
-     */
-    public TableDataInfo(List<?> list, int total) {
-        this.rows = list;
-        this.total = total;
-    }
-
-    public long getTotal() {
-        return total;
-    }
-
-    public void setTotal(long total) {
-        this.total = total;
-    }
-
-    public List<?> getRows() {
-        return rows;
-    }
-
-    public void setRows(List<?> rows) {
-        this.rows = rows;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/controller/web/page/TableSupport.java

@@ -1,45 +0,0 @@
-package com.usky.system.controller.web.page;
-
-
-import com.usky.common.core.util.ServletUtils;
-
-/**
- * 表格数据处理
- */
-public class TableSupport {
-    /**
-     * 当前记录起始索引
-     */
-    public static final String PAGE_NUM = "pageNum";
-
-    /**
-     * 每页显示记录数
-     */
-    public static final String PAGE_SIZE = "pageSize";
-
-    /**
-     * 排序列
-     */
-    public static final String ORDER_BY_COLUMN = "orderByColumn";
-
-    /**
-     * 排序的方向 "desc" 或者 "asc".
-     */
-    public static final String IS_ASC = "isAsc";
-
-    /**
-     * 封装分页对象
-     */
-    public static PageDomain getPageDomain() {
-        PageDomain pageDomain = new PageDomain();
-        pageDomain.setPageNum(ServletUtils.getParameterToInt(PAGE_NUM));
-        pageDomain.setPageSize(ServletUtils.getParameterToInt(PAGE_SIZE));
-        pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
-        pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC));
-        return pageDomain;
-    }
-
-    public static PageDomain buildPageRequest() {
-        return getPageDomain();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysConfig.java

@@ -1,107 +0,0 @@
-package com.usky.system.domain;
-
-
-import com.usky.common.core.bean.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-
-/**
- * 参数配置表 sys_config
- * 
- * @author yq
- */
-public class SysConfig extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 参数主键 */
-    private Long configId;
-
-    /** 参数名称 */
-    private String configName;
-
-    /** 参数键名 */
-    private String configKey;
-
-    /** 参数键值 */
-    private String configValue;
-
-    /** 系统内置（Y是 N否） */
-    private String configType;
-
-    public Long getConfigId()
-    {
-        return configId;
-    }
-
-    public void setConfigId(Long configId)
-    {
-        this.configId = configId;
-    }
-
-    @NotBlank(message = "参数名称不能为空")
-    @Size(min = 0, max = 100, message = "参数名称不能超过100个字符")
-    public String getConfigName()
-    {
-        return configName;
-    }
-
-    public void setConfigName(String configName)
-    {
-        this.configName = configName;
-    }
-
-    @NotBlank(message = "参数键名长度不能为空")
-    @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符")
-    public String getConfigKey()
-    {
-        return configKey;
-    }
-
-    public void setConfigKey(String configKey)
-    {
-        this.configKey = configKey;
-    }
-
-    @NotBlank(message = "参数键值不能为空")
-    @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符")
-    public String getConfigValue()
-    {
-        return configValue;
-    }
-
-    public void setConfigValue(String configValue)
-    {
-        this.configValue = configValue;
-    }
-
-    public String getConfigType()
-    {
-        return configType;
-    }
-
-    public void setConfigType(String configType)
-    {
-        this.configType = configType;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("configId", getConfigId())
-            .append("configName", getConfigName())
-            .append("configKey", getConfigKey())
-            .append("configValue", getConfigValue())
-            .append("configType", getConfigType())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysDept.java

@@ -1,225 +0,0 @@
-package com.usky.system.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.usky.common.core.bean.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * 部门表 sys_dept
- * 
- * @author yq
- */
-public class SysDept extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 部门ID */
-    @TableId(value = "dept_id")
-    private Long deptId;
-
-    /** 父部门ID */
-    private Long parentId;
-
-    /** 祖级列表 */
-    private String ancestors;
-
-    /** 部门名称 */
-    private String deptName;
-
-    /** 显示顺序 */
-    private String orderNum;
-
-    /** 负责人 */
-    private String leader;
-
-    /** 联系电话 */
-    private String phone;
-
-    /** 邮箱 */
-    private String email;
-
-    /** 部门状态:0正常,1停用 */
-    private String status;
-
-    /** 删除标志（0代表存在 2代表删除） */
-    private String delFlag;
-
-    /** 父部门名称 */
-    @TableField(exist = false)
-    private String parentName;
-
-    /**
-     * 租户ID
-     */
-    private Integer tenantId;
-
-    public Integer getTenantId()
-    {
-        return tenantId;
-    }
-
-    public void setTenantId(Integer tenantId)
-    {
-        this.tenantId = tenantId;
-    }
-
-    /** 子部门 */
-    @TableField(exist = false)
-    private List<SysDept> children = new ArrayList<SysDept>();
-
-    public Long getDeptId()
-    {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId)
-    {
-        this.deptId = deptId;
-    }
-
-    public Long getParentId()
-    {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId)
-    {
-        this.parentId = parentId;
-    }
-
-    public String getAncestors()
-    {
-        return ancestors;
-    }
-
-    public void setAncestors(String ancestors)
-    {
-        this.ancestors = ancestors;
-    }
-
-    @NotBlank(message = "部门名称不能为空")
-    @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
-    public String getDeptName()
-    {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName)
-    {
-        this.deptName = deptName;
-    }
-
-    @NotBlank(message = "显示顺序不能为空")
-    public String getOrderNum()
-    {
-        return orderNum;
-    }
-
-    public void setOrderNum(String orderNum)
-    {
-        this.orderNum = orderNum;
-    }
-
-    public String getLeader()
-    {
-        return leader;
-    }
-
-    public void setLeader(String leader)
-    {
-        this.leader = leader;
-    }
-
-    @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
-    public String getPhone()
-    {
-        return phone;
-    }
-
-    public void setPhone(String phone)
-    {
-        this.phone = phone;
-    }
-
-    @Email(message = "邮箱格式不正确")
-    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
-    public String getEmail()
-    {
-        return email;
-    }
-
-    public void setEmail(String email)
-    {
-        this.email = email;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getDelFlag()
-    {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag)
-    {
-        this.delFlag = delFlag;
-    }
-
-    public String getParentName()
-    {
-        return parentName;
-    }
-
-    public void setParentName(String parentName)
-    {
-        this.parentName = parentName;
-    }
-
-
-    public List<SysDept> getChildren()
-    {
-        return children;
-    }
-
-    public void setChildren(List<SysDept> children)
-    {
-        this.children = children;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("deptId", getDeptId())
-            .append("parentId", getParentId())
-            .append("ancestors", getAncestors())
-            .append("deptName", getDeptName())
-            .append("orderNum", getOrderNum())
-            .append("leader", getLeader())
-            .append("phone", getPhone())
-            .append("email", getEmail())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysDictData.java

@@ -1,170 +0,0 @@
-package com.usky.system.domain;
-
-
-import com.usky.common.core.bean.BaseEntity;
-import com.usky.system.domain.constants.UserConstants;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-
-/**
- * 字典数据表 sys_dict_data
- * 
- * @author yq
- */
-public class SysDictData extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 字典编码 */
-    private Long dictCode;
-
-    /** 字典排序 */
-    private Long dictSort;
-
-    /** 字典标签 */
-    private String dictLabel;
-
-    /** 字典键值 */
-    private String dictValue;
-
-    /** 字典类型 */
-    private String dictType;
-
-    /** 样式属性（其他样式扩展） */
-    private String cssClass;
-
-    /** 表格字典样式 */
-    private String listClass;
-
-    /** 是否默认（Y是 N否） */
-    private String isDefault;
-
-    /** 状态（0正常 1停用） */
-    private String status;
-
-    public Long getDictCode()
-    {
-        return dictCode;
-    }
-
-    public void setDictCode(Long dictCode)
-    {
-        this.dictCode = dictCode;
-    }
-
-    public Long getDictSort()
-    {
-        return dictSort;
-    }
-
-    public void setDictSort(Long dictSort)
-    {
-        this.dictSort = dictSort;
-    }
-
-    @NotBlank(message = "字典标签不能为空")
-    @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符")
-    public String getDictLabel()
-    {
-        return dictLabel;
-    }
-
-    public void setDictLabel(String dictLabel)
-    {
-        this.dictLabel = dictLabel;
-    }
-
-    @NotBlank(message = "字典键值不能为空")
-    @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
-    public String getDictValue()
-    {
-        return dictValue;
-    }
-
-    public void setDictValue(String dictValue)
-    {
-        this.dictValue = dictValue;
-    }
-
-    @NotBlank(message = "字典类型不能为空")
-    @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符")
-    public String getDictType()
-    {
-        return dictType;
-    }
-
-    public void setDictType(String dictType)
-    {
-        this.dictType = dictType;
-    }
-
-    @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符")
-    public String getCssClass()
-    {
-        return cssClass;
-    }
-
-    public void setCssClass(String cssClass)
-    {
-        this.cssClass = cssClass;
-    }
-
-    public String getListClass()
-    {
-        return listClass;
-    }
-
-    public void setListClass(String listClass)
-    {
-        this.listClass = listClass;
-    }
-
-    public boolean getDefault()
-    {
-        return UserConstants.YES.equals(this.isDefault) ? true : false;
-    }
-
-    public String getIsDefault()
-    {
-        return isDefault;
-    }
-
-    public void setIsDefault(String isDefault)
-    {
-        this.isDefault = isDefault;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("dictCode", getDictCode())
-            .append("dictSort", getDictSort())
-            .append("dictLabel", getDictLabel())
-            .append("dictValue", getDictValue())
-            .append("dictType", getDictType())
-            .append("cssClass", getCssClass())
-            .append("listClass", getListClass())
-            .append("isDefault", getIsDefault())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysDictType.java

@@ -1,104 +0,0 @@
-package com.usky.system.domain;
-
-
-import com.usky.common.core.bean.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-
-/**
- * 字典类型表 sys_dict_type
- * 
- * @author yq
- */
-public class SysDictType extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 字典主键 */
-    private Long dictId;
-
-    /** 字典名称 */
-    private String dictName;
-
-    /** 字典类型 */
-    private String dictType;
-
-    /** 状态（0正常 1停用） */
-    private String status;
-
-    /** 租户ID */
-    private Integer tenantId;
-
-    public Integer getTenantId()
-    {
-        return tenantId;
-    }
-
-    public void setTenantId(Integer tenantId)
-    {
-        this.tenantId = tenantId;
-    }
-
-    public Long getDictId()
-    {
-        return dictId;
-    }
-
-    public void setDictId(Long dictId)
-    {
-        this.dictId = dictId;
-    }
-
-    @NotBlank(message = "字典名称不能为空")
-    @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符")
-    public String getDictName()
-    {
-        return dictName;
-    }
-
-    public void setDictName(String dictName)
-    {
-        this.dictName = dictName;
-    }
-
-    @NotBlank(message = "字典类型不能为空")
-    @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
-    public String getDictType()
-    {
-        return dictType;
-    }
-
-    public void setDictType(String dictType)
-    {
-        this.dictType = dictType;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("dictId", getDictId())
-            .append("dictName", getDictName())
-            .append("dictType", getDictType())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysLogininfor.java

@@ -1,125 +0,0 @@
-package com.usky.system.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 系统访问记录表 sys_logininfor
- *
- * @author ruoyi
- */
-public class SysLogininfor
-{
-    private static final long serialVersionUID = 1L;
-
-    /** ID */
-    private Long infoId;
-
-    /** 用户账号 */
-    private String userName;
-
-    /** 状态 0成功 1失败 */
-    private String status;
-
-    /** 地址 */
-    private String ipaddr;
-
-    /** 描述 */
-    private String msg;
-
-    /** 访问时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date accessTime;
-
-    public String getSearchValue() {
-        return searchValue;
-    }
-
-    public void setSearchValue(String searchValue) {
-        this.searchValue = searchValue;
-    }
-
-    public Map<String, Object> getParams() {
-        if (this.params == null) {
-            this.params = new HashMap();
-        }
-
-        return this.params;
-    }
-
-    public void setParams(Map<String, Object> params) {
-        this.params = params;
-    }
-
-    /** 搜索值 */
-    @TableField(exist = false)
-    private String searchValue;
-
-    /** 请求参数 */
-    @TableField(exist = false)
-    private Map<String, Object> params;
-
-    public Long getInfoId()
-    {
-        return infoId;
-    }
-
-    public void setInfoId(Long infoId)
-    {
-        this.infoId = infoId;
-    }
-
-    public String getUserName()
-    {
-        return userName;
-    }
-
-    public void setUserName(String userName)
-    {
-        this.userName = userName;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getIpaddr()
-    {
-        return ipaddr;
-    }
-
-    public void setIpaddr(String ipaddr)
-    {
-        this.ipaddr = ipaddr;
-    }
-
-    public String getMsg()
-    {
-        return msg;
-    }
-
-    public void setMsg(String msg)
-    {
-        this.msg = msg;
-    }
-
-    public Date getAccessTime()
-    {
-        return accessTime;
-    }
-
-    public void setAccessTime(Date accessTime)
-    {
-        this.accessTime = accessTime;
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysMenu.java

@@ -1,250 +0,0 @@
-package com.usky.system.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.usky.common.core.bean.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * 菜单权限表 sys_menu
- * 
- * @author yq
- */
-public class SysMenu extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 菜单ID */
-    private Long menuId;
-
-    /** 菜单名称 */
-    private String menuName;
-
-    /** 父菜单名称 */
-    @TableField(exist = false)
-    private String parentName;
-
-    /** 父菜单ID */
-    private Long parentId;
-
-    /** 显示顺序 */
-    private String orderNum;
-
-    /** 路由地址 */
-    private String path;
-
-    /** 组件路径 */
-    private String component;
-
-    /** 是否为外链（0是 1否） */
-    private String isFrame;
-
-    /** 是否缓存（0缓存 1不缓存） */
-    private String isCache;
-
-    /** 类型（M目录 C菜单 F按钮） */
-    private String menuType;
-
-    /** 显示状态（0显示 1隐藏） */
-    private String visible;
-    
-    /** 菜单状态（0显示 1隐藏） */
-    private String status;
-
-    /** 权限字符串 */
-    private String perms;
-
-    /** 菜单图标 */
-    private String icon;
-
-    /** 子菜单 */
-    @TableField(exist = false)
-    private List<SysMenu> children = new ArrayList<SysMenu>();
-
-    public Long getMenuId()
-    {
-        return menuId;
-    }
-
-    public void setMenuId(Long menuId)
-    {
-        this.menuId = menuId;
-    }
-
-    @NotBlank(message = "菜单名称不能为空")
-    @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
-    public String getMenuName()
-    {
-        return menuName;
-    }
-
-    public void setMenuName(String menuName)
-    {
-        this.menuName = menuName;
-    }
-
-    public String getParentName()
-    {
-        return parentName;
-    }
-
-    public void setParentName(String parentName)
-    {
-        this.parentName = parentName;
-    }
-
-    public Long getParentId()
-    {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId)
-    {
-        this.parentId = parentId;
-    }
-
-    @NotBlank(message = "显示顺序不能为空")
-    public String getOrderNum()
-    {
-        return orderNum;
-    }
-
-    public void setOrderNum(String orderNum)
-    {
-        this.orderNum = orderNum;
-    }
-
-    @Size(min = 0, max = 200, message = "路由地址不能超过200个字符")
-    public String getPath()
-    {
-        return path;
-    }
-
-    public void setPath(String path)
-    {
-        this.path = path;
-    }
-
-    @Size(min = 0, max = 200, message = "组件路径不能超过255个字符")
-    public String getComponent()
-    {
-        return component;
-    }
-
-    public void setComponent(String component)
-    {
-        this.component = component;
-    }
-
-    public String getIsFrame()
-    {
-        return isFrame;
-    }
-
-    public void setIsFrame(String isFrame)
-    {
-        this.isFrame = isFrame;
-    }
-
-    public String getIsCache()
-    {
-        return isCache;
-    }
-
-    public void setIsCache(String isCache)
-    {
-        this.isCache = isCache;
-    }
-
-    @NotBlank(message = "菜单类型不能为空")
-    public String getMenuType()
-    {
-        return menuType;
-    }
-
-    public void setMenuType(String menuType)
-    {
-        this.menuType = menuType;
-    }
-
-    public String getVisible()
-    {
-        return visible;
-    }
-
-    public void setVisible(String visible)
-    {
-        this.visible = visible;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
-    public String getPerms()
-    {
-        return perms;
-    }
-
-    public void setPerms(String perms)
-    {
-        this.perms = perms;
-    }
-
-    public String getIcon()
-    {
-        return icon;
-    }
-
-    public void setIcon(String icon)
-    {
-        this.icon = icon;
-    }
-
-    public List<SysMenu> getChildren()
-    {
-        return children;
-    }
-
-    public void setChildren(List<SysMenu> children)
-    {
-        this.children = children;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("menuId", getMenuId())
-            .append("menuName", getMenuName())
-            .append("parentId", getParentId())
-            .append("orderNum", getOrderNum())
-            .append("path", getPath())
-            .append("component", getComponent())
-            .append("isFrame", getIsFrame())
-            .append("IsCache", getIsCache())
-            .append("menuType", getMenuType())
-            .append("visible", getVisible())
-            .append("status ", getStatus())
-            .append("perms", getPerms())
-            .append("icon", getIcon())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysNotice.java

@@ -1,103 +0,0 @@
-package com.usky.system.domain;
-
-
-import com.usky.common.core.bean.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-
-/**
- * 通知公告表 sys_notice
- * 
- * @author yq
- */
-public class SysNotice extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 公告ID */
-    private Long noticeId;
-
-    /** 公告标题 */
-    private String noticeTitle;
-
-    /** 公告类型（1通知 2公告） */
-    private String noticeType;
-
-    /** 公告内容 */
-    private String noticeContent;
-
-    /** 公告状态（0正常 1关闭） */
-    private String status;
-
-    public Long getNoticeId()
-    {
-        return noticeId;
-    }
-
-    public void setNoticeId(Long noticeId)
-    {
-        this.noticeId = noticeId;
-    }
-
-    public void setNoticeTitle(String noticeTitle)
-    {
-        this.noticeTitle = noticeTitle;
-    }
-
-    @NotBlank(message = "公告标题不能为空")
-    @Size(min = 0, max = 50, message = "公告标题不能超过50个字符")
-    public String getNoticeTitle()
-    {
-        return noticeTitle;
-    }
-
-    public void setNoticeType(String noticeType)
-    {
-        this.noticeType = noticeType;
-    }
-
-    public String getNoticeType()
-    {
-        return noticeType;
-    }
-
-    public void setNoticeContent(String noticeContent)
-    {
-        this.noticeContent = noticeContent;
-    }
-
-    public String getNoticeContent()
-    {
-        return noticeContent;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("noticeId", getNoticeId())
-            .append("noticeTitle", getNoticeTitle())
-            .append("noticeType", getNoticeType())
-            .append("noticeContent", getNoticeContent())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysOperLog.java

@@ -1,271 +0,0 @@
-package com.usky.system.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * 操作日志记录表 oper_log
- * 
- * @author yq
- */
-public class SysOperLog
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 日志主键 */
-    private Long operId;
-
-    /** 操作模块 */
-    private String title;
-
-    /** 业务类型（0其它 1新增 2修改 3删除） */
-    private Integer businessType;
-
-    /** 业务类型数组 */
-    @TableField(exist = false)
-    private Integer[] businessTypes;
-
-    /** 请求方法 */
-    private String method;
-
-    /** 请求方式 */
-    private String requestMethod;
-
-    /** 操作类别（0其它 1后台用户 2手机端用户） */
-    private Integer operatorType;
-
-    /** 操作人员 */
-    private String operName;
-
-    /** 部门名称 */
-    private String deptName;
-
-    /** 请求url */
-    private String operUrl;
-
-    /** 操作地址 */
-    private String operIp;
-
-    /** 操作地点 */
-    private String operLocation;
-
-    /** 请求参数 */
-    private String operParam;
-
-    /** 返回参数 */
-    private String jsonResult;
-
-    /** 操作状态（0正常 1异常） */
-    private Integer status;
-
-    /** 错误消息 */
-    private String errorMsg;
-
-    /** 操作时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date operTime;
-
-    public String getSearchValue() {
-        return searchValue;
-    }
-
-    public void setSearchValue(String searchValue) {
-        this.searchValue = searchValue;
-    }
-
-    public Map<String, Object> getParams() {
-        if (this.params == null) {
-            this.params = new HashMap();
-        }
-
-        return this.params;
-    }
-
-    public void setParams(Map<String, Object> params) {
-        this.params = params;
-    }
-
-    /** 搜索值 */
-    @TableField(exist = false)
-    private String searchValue;
-
-    /** 请求参数 */
-    @TableField(exist = false)
-    private Map<String, Object> params;
-
-
-    public Long getOperId()
-    {
-        return operId;
-    }
-
-    public void setOperId(Long operId)
-    {
-        this.operId = operId;
-    }
-
-    public String getTitle()
-    {
-        return title;
-    }
-
-    public void setTitle(String title)
-    {
-        this.title = title;
-    }
-
-    public Integer getBusinessType()
-    {
-        return businessType;
-    }
-
-    public void setBusinessType(Integer businessType)
-    {
-        this.businessType = businessType;
-    }
-
-    public Integer[] getBusinessTypes()
-    {
-        return businessTypes;
-    }
-
-    public void setBusinessTypes(Integer[] businessTypes)
-    {
-        this.businessTypes = businessTypes;
-    }
-
-    public String getMethod()
-    {
-        return method;
-    }
-
-    public void setMethod(String method)
-    {
-        this.method = method;
-    }
-
-    public String getRequestMethod()
-    {
-        return requestMethod;
-    }
-
-    public void setRequestMethod(String requestMethod)
-    {
-        this.requestMethod = requestMethod;
-    }
-
-    public Integer getOperatorType()
-    {
-        return operatorType;
-    }
-
-    public void setOperatorType(Integer operatorType)
-    {
-        this.operatorType = operatorType;
-    }
-
-    public String getOperName()
-    {
-        return operName;
-    }
-
-    public void setOperName(String operName)
-    {
-        this.operName = operName;
-    }
-
-    public String getDeptName()
-    {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName)
-    {
-        this.deptName = deptName;
-    }
-
-    public String getOperUrl()
-    {
-        return operUrl;
-    }
-
-    public void setOperUrl(String operUrl)
-    {
-        this.operUrl = operUrl;
-    }
-
-    public String getOperIp()
-    {
-        return operIp;
-    }
-
-    public void setOperIp(String operIp)
-    {
-        this.operIp = operIp;
-    }
-
-    public String getOperLocation()
-    {
-        return operLocation;
-    }
-
-    public void setOperLocation(String operLocation)
-    {
-        this.operLocation = operLocation;
-    }
-
-    public String getOperParam()
-    {
-        return operParam;
-    }
-
-    public void setOperParam(String operParam)
-    {
-        this.operParam = operParam;
-    }
-
-    public String getJsonResult()
-    {
-        return jsonResult;
-    }
-
-    public void setJsonResult(String jsonResult)
-    {
-        this.jsonResult = jsonResult;
-    }
-
-    public Integer getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(Integer status)
-    {
-        this.status = status;
-    }
-
-    public String getErrorMsg()
-    {
-        return errorMsg;
-    }
-
-    public void setErrorMsg(String errorMsg)
-    {
-        this.errorMsg = errorMsg;
-    }
-
-    public Date getOperTime()
-    {
-        return operTime;
-    }
-
-    public void setOperTime(Date operTime)
-    {
-        this.operTime = operTime;
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysPlatform.java

@@ -1,76 +0,0 @@
-package com.usky.system.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 平台信息表
- * </p>
- *
- * @author ya
- * @since 2022-05-18
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysPlatform implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 平台名称
-     */
-    private String platformName;
-
-    /**
-     * 平台状态（0 停用 1 启用）
-     */
-    private String status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * 激活码
-     */
-    @TableField("tenantKey")
-    private String tenantKey;
-
-
-}

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysPlatformMenu.java

@@ -1,35 +0,0 @@
-package com.usky.system.domain;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 平台和菜单关联表
- * </p>
- *
- * @author ya
- * @since 2022-05-18
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysPlatformMenu implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 平台ID
-     */
-    private Long platformId;
-
-    /**
-     * 菜单ID
-     */
-    private Long menuId;
-
-
-}

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysPost.java

@@ -1,134 +0,0 @@
-package com.usky.system.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.usky.common.core.bean.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-
-/**
- * 岗位表 sys_post
- * 
- * @author yq
- */
-public class SysPost extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 岗位序号 */
-    private Long postId;
-
-    /** 岗位编码 */
-    private String postCode;
-
-    /** 岗位名称 */
-    private String postName;
-
-    /** 岗位排序 */
-    private String postSort;
-
-    /** 状态（0正常 1停用） */
-    private String status;
-
-    /** 租户ID */
-    private Integer tenantId;
-
-    public Integer getTenantId()
-    {
-        return tenantId;
-    }
-
-    public void setTenantId(Integer tenantId)
-    {
-        this.tenantId = tenantId;
-    }
-
-
-    /** 用户是否存在此岗位标识 默认不存在 */
-    @TableField(exist = false)
-    private boolean flag = false;
-
-    public Long getPostId()
-    {
-        return postId;
-    }
-
-    public void setPostId(Long postId)
-    {
-        this.postId = postId;
-    }
-
-    @NotBlank(message = "岗位编码不能为空")
-    @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符")
-    public String getPostCode()
-    {
-        return postCode;
-    }
-
-    public void setPostCode(String postCode)
-    {
-        this.postCode = postCode;
-    }
-
-    @NotBlank(message = "岗位名称不能为空")
-    @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符")
-    public String getPostName()
-    {
-        return postName;
-    }
-
-    public void setPostName(String postName)
-    {
-        this.postName = postName;
-    }
-
-    @NotBlank(message = "显示顺序不能为空")
-    public String getPostSort()
-    {
-        return postSort;
-    }
-
-    public void setPostSort(String postSort)
-    {
-        this.postSort = postSort;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public boolean isFlag()
-    {
-        return flag;
-    }
-
-    public void setFlag(boolean flag)
-    {
-        this.flag = flag;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("postId", getPostId())
-            .append("postCode", getPostCode())
-            .append("postName", getPostName())
-            .append("postSort", getPostSort())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysRole.java

@@ -1,234 +0,0 @@
-package com.usky.system.domain;
-
-
-import com.usky.common.core.bean.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-
-/**
- * 角色表 sys_role
- * 
- * @author yq
- */
-public class SysRole extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 角色ID */
-    private Long roleId;
-
-    /** 角色名称 */
-    private String roleName;
-
-    /** 角色权限 */
-    private String roleKey;
-
-    /** 角色排序 */
-    private String roleSort;
-
-    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
-    private String dataScope;
-
-    /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
-    private boolean menuCheckStrictly;
-
-    /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
-    private boolean deptCheckStrictly;
-
-    /** 角色状态（0正常 1停用） */
-    private String status;
-
-    /** 删除标志（0代表存在 2代表删除） */
-    private String delFlag;
-
-    /** 用户是否存在此角色标识 默认不存在 */
-    private boolean flag = false;
-
-    /** 菜单组 */
-    private Long[] menuIds;
-
-    /** 部门组（数据权限） */
-    private Long[] deptIds;
-
-    /** 租户ID */
-    private Integer tenantId;
-
-    public SysRole()
-    {
-
-    }
-
-    public Integer getTenantId()
-    {
-        return tenantId;
-    }
-
-    public void setTenantId(Integer tenantId)
-    {
-        this.tenantId = tenantId;
-    }
-
-    public SysRole(Long roleId)
-    {
-        this.roleId = roleId;
-    }
-
-    public Long getRoleId()
-    {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId)
-    {
-        this.roleId = roleId;
-    }
-
-    public boolean isAdmin()
-    {
-        return isAdmin(this.roleId);
-    }
-
-    public static boolean isAdmin(Long roleId)
-    {
-        return roleId != null && 1L == roleId;
-    }
-
-    @NotBlank(message = "角色名称不能为空")
-    @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符")
-    public String getRoleName()
-    {
-        return roleName;
-    }
-
-    public void setRoleName(String roleName)
-    {
-        this.roleName = roleName;
-    }
-
-    @NotBlank(message = "权限字符不能为空")
-    @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符")
-    public String getRoleKey()
-    {
-        return roleKey;
-    }
-
-    public void setRoleKey(String roleKey)
-    {
-        this.roleKey = roleKey;
-    }
-
-    @NotBlank(message = "显示顺序不能为空")
-    public String getRoleSort()
-    {
-        return roleSort;
-    }
-
-    public void setRoleSort(String roleSort)
-    {
-        this.roleSort = roleSort;
-    }
-
-    public String getDataScope()
-    {
-        return dataScope;
-    }
-
-    public void setDataScope(String dataScope)
-    {
-        this.dataScope = dataScope;
-    }
-
-    public boolean isMenuCheckStrictly()
-    {
-        return menuCheckStrictly;
-    }
-
-    public void setMenuCheckStrictly(boolean menuCheckStrictly)
-    {
-        this.menuCheckStrictly = menuCheckStrictly;
-    }
-
-    public boolean isDeptCheckStrictly()
-    {
-        return deptCheckStrictly;
-    }
-
-    public void setDeptCheckStrictly(boolean deptCheckStrictly)
-    {
-        this.deptCheckStrictly = deptCheckStrictly;
-    }
-
-    public String getStatus()
-    {
-        return status;
-    }
-
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
-
-    public String getDelFlag()
-    {
-        return delFlag;
-    }
-
-    public void setDelFlag(String delFlag)
-    {
-        this.delFlag = delFlag;
-    }
-
-    public boolean isFlag()
-    {
-        return flag;
-    }
-
-    public void setFlag(boolean flag)
-    {
-        this.flag = flag;
-    }
-
-    public Long[] getMenuIds()
-    {
-        return menuIds;
-    }
-
-    public void setMenuIds(Long[] menuIds)
-    {
-        this.menuIds = menuIds;
-    }
-
-    public Long[] getDeptIds()
-    {
-        return deptIds;
-    }
-
-    public void setDeptIds(Long[] deptIds)
-    {
-        this.deptIds = deptIds;
-    }
-    
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("roleId", getRoleId())
-            .append("roleName", getRoleName())
-            .append("roleKey", getRoleKey())
-            .append("roleSort", getRoleSort())
-            .append("dataScope", getDataScope())
-            .append("menuCheckStrictly", isMenuCheckStrictly())
-            .append("deptCheckStrictly", isDeptCheckStrictly())
-            .append("status", getStatus())
-            .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysRoleDept.java

@@ -1,46 +0,0 @@
-package com.usky.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 角色和部门关联 sys_role_dept
- * 
- * @author yq
- */
-public class SysRoleDept
-{
-    /** 角色ID */
-    private Long roleId;
-    
-    /** 部门ID */
-    private Long deptId;
-
-    public Long getRoleId()
-    {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId)
-    {
-        this.roleId = roleId;
-    }
-
-    public Long getDeptId()
-    {
-        return deptId;
-    }
-
-    public void setDeptId(Long deptId)
-    {
-        this.deptId = deptId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("roleId", getRoleId())
-            .append("deptId", getDeptId())
-            .toString();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysRoleMenu.java

@@ -1,46 +0,0 @@
-package com.usky.system.domain;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 角色和菜单关联 sys_role_menu
- * 
- * @author yq
- */
-public class SysRoleMenu
-{
-    /** 角色ID */
-    private Long roleId;
-    
-    /** 菜单ID */
-    private Long menuId;
-
-    public Long getRoleId()
-    {
-        return roleId;
-    }
-
-    public void setRoleId(Long roleId)
-    {
-        this.roleId = roleId;
-    }
-
-    public Long getMenuId()
-    {
-        return menuId;
-    }
-
-    public void setMenuId(Long menuId)
-    {
-        this.menuId = menuId;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("roleId", getRoleId())
-            .append("menuId", getMenuId())
-            .toString();
-    }
-}

service-system/service-system-biz/src/main/java/com/usky/system/domain/SysTenant.java

@@ -1,118 +0,0 @@
-package com.usky.system.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 租户信息表
- * </p>
- *
- * @author ya
- * @since 2022-05-05
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class SysTenant implements Serializable {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 租户ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 租户编号
-     */
-    private String tenantCode;
-
-    /**
-     * 租户名称
-     */
-    private String tenantName;
-
-    /**
-     * 租户负责人
-     */
-    private String tenantManager;
-
-    /**
-     * 租户类型（0 试用租户  1 正式租户）
-     */
-    private String tenantType;
-
-    /**
-     * 租户站点域名
-     */
-    private String domain;
-
-    /**
-     * 租户邮箱
-     */
-    private String email;
-
-    /**
-     * 手机号码
-     */
-    private String phoneNumber;
-
-    /**
-     * 联系地址
-     */
-    private String address;
-
-    /**
-     * 地理位置
-     */
-    private String geoPosition;
-
-    /**
-     * 有效期限
-     */
-    private String tenantTerm;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 租户状态（0正常 1停用）
-     */
-    private String status;
-
-    /**
-     * 创建者
-     */
-    private String createBy;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新者
-     */
-    private String updateBy;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updateTime;
-
-    /**
-     * 系统名称
-     */
-    private String systemName;
-
-}