""

hnls-admin/hnls-admin-api/pom.xml

@@ -1,40 +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>
-        <groupId>com.tofly</groupId>
-        <artifactId>hnls-admin</artifactId>
-        <version>1.0.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>hnls-admin-api</artifactId>
-    <version>1.0.0</version>
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-okhttp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.3.2</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

hnls-admin/hnls-admin-api/src/main/java/com/tofly/api/CodeClient.java

@@ -1,57 +0,0 @@
-package com.tofly.api;
-
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.pojo.Syschildcode;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-
-/**
- * @author FlashWJL
- * @date 2021/3/23 13:26
- */
-@FeignClient(name = "tofly-base",contextId="CodeClient")
-public interface CodeClient {
-
-    /**
-     * 根据子级编码ID查询编码名称
-     * 后期删除，下面有根据子级编码信息查询
-     * @param id
-     * @return
-     */
-    @GetMapping("/syscommoncode/getname")
-    String getname(@RequestParam(value = "id") Long id);
-
-    /**
-     * 根据子级条件获取子级code信息
-     * @param code
-     * @return
-     */
-    @PostMapping("/syscommoncode/getChild")
-    ResultRespone getChild(@RequestBody Syschildcode code);
-
-    /**
-     * 根据子级条件获取子级code信息
-     * @return
-     */
-    @GetMapping("/syscommoncode/all")
-    ResultRespone getAll();
-
-    /**
-     * 根据子级条件获取子级code信息
-     * @return
-     */
-    @GetMapping("/syscommoncode/fj")
-    ResultRespone getfj();
-
-    /**
-     * 根据父级多个ID查看所有子级
-     * @return
-     */
-    @GetMapping("/syscommoncode/getByfjId")
-    ResultRespone getBylistPcid(@RequestParam("pCid") String pid);
-}
-

hnls-admin/hnls-admin-api/src/main/java/com/tofly/api/DepartmentClient.java

@@ -1,28 +0,0 @@
-package com.tofly.api;
-
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.pojo.Department;
-import com.tofly.pojo.User;
-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.RequestParam;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(name = "tofly-base",contextId="DepartmentClient")
-public interface DepartmentClient {
-
-    @GetMapping("/department/{id}")
-    ResultRespone<Department> getById(@PathVariable("id") Long id);
-
-    @GetMapping("/department/listAll")
-    ResultRespone<List<Department>> departmentListAll();
-
-    @GetMapping("/user/getUserByDepts")
-    ResultRespone<List<Map<String, Object>>> getUserByDepts(@RequestParam(value = "depts") String depts);
-
-    @GetMapping("/user/getDeptUserList")
-    ResultRespone<List<User>> getDeptUserList(@RequestParam(value = "deptId", required = false) Long deptId);
-}

hnls-admin/hnls-admin-api/src/main/java/com/tofly/api/UserClent.java

@@ -1,16 +0,0 @@
-package com.tofly.api;
-
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.pojo.User;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-
-@FeignClient(name = "tofly-base",contextId="UserClent")
-public interface UserClent {
-
-    @GetMapping("/user/{id}")
-    ResultRespone<User> getById(@PathVariable("id") Long id);
-
-
-}

hnls-admin/hnls-admin-api/src/main/java/com/tofly/api/UserTaskClient.java

@@ -1,44 +0,0 @@
-package com.tofly.api;
-
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.pojo.message.Messagepush;
-import com.tofly.pojo.message.Messagerecipient;
-import com.tofly.pojo.message.Usertask;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.util.List;
-
-/**
- * 代办事项服务
- */
-@FeignClient(name = "tofly-base",contextId="UserTaskClient")
-public interface UserTaskClient {
-    /**
-     * 存入待办事项信息
-     * @param usertask
-     * @return
-     */
-    @PostMapping("/usertask/save")
-    ResultRespone<Boolean>  save(@RequestBody Usertask usertask);
-
-    /**
-     * 修改代办事项信息
-     * @param usertask
-     * @return
-     */
-    @PutMapping("/usertask/updata")
-    ResultRespone<Boolean> updateById(@RequestBody Usertask usertask);
-
-
-    /**
-     * 根据传入对象查询待办事项信息
-     * @param usertask
-     * @return
-     */
-    @PostMapping("/usertask/getUserTaskInfo")
-    ResultRespone<List<Usertask>> getUserTaskInfo(@RequestBody Usertask usertask);
-}

hnls-admin/hnls-admin-api/src/main/java/com/tofly/api/message/MessageClient.java

@@ -1,30 +0,0 @@
-package com.tofly.api.message;
-
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.pojo.message.Messagepush;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * 消息推送数据服务
- */
-@FeignClient(name = "tofly-base",contextId="MessageClient")
-public interface MessageClient {
-    /**
-     * 存入消息信息
-     * @param messagepush
-     * @return
-     */
-    @PostMapping("/messagepush/save")
-    ResultRespone<Long> save(@RequestBody Messagepush messagepush);
-
-    /**
-     * 修改消息对象信息
-     * @param messagepush
-     * @return
-     */
-    @PutMapping("/messagepush/updata")
-    ResultRespone<Boolean> updateById(@RequestBody Messagepush messagepush);
-}

hnls-admin/hnls-admin-api/src/main/java/com/tofly/api/message/MessageStateClient.java

@@ -1,29 +0,0 @@
-package com.tofly.api.message;
-
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.pojo.message.Messagepush;
-import com.tofly.pojo.message.Messagerecipient;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 消息状态
- */
-@FeignClient(name = "tofly-base",contextId="MessageStateClient")
-public interface MessageStateClient {
-    /**
-     * 根据消息id获取消息对象阅读对象
-     * @param id
-     * @return
-     */
-    @GetMapping("/messagerecipient/{id}")
-    ResultRespone<Messagerecipient> getById(@PathVariable(value = "id") Long id);
-
-    /**
-     * 新增消息接受对象信息
-     * @param messagerecipient
-     * @return
-     */
-    @PostMapping("/messagerecipient/save")
-    ResultRespone<Boolean> save(@RequestBody Messagerecipient messagerecipient);
-}

hnls-admin/hnls-admin-api/src/main/java/com/tofly/pojo/CustomCode.java

@@ -1,15 +0,0 @@
-package com.tofly.pojo;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author by Wangjieliu
- * @date 2021/3/18.
- */
-@Data
-public class CustomCode extends Syschildcode {
-    List<CustomCode> codeList=new ArrayList<>();
-}

hnls-admin/hnls-admin-api/src/main/java/com/tofly/pojo/Department.java

@@ -1,99 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.tofly.mybatisplus.config.ToflySqlCondition;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 部门表
- *
- * @author wangjian
- * @date Mon Oct 21 00:00:00 CST 2019
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_SMPN_DEPARTMENT_X", resultMap = "departmentMap")
-@KeySequence("TF_SMPN_DEPARTMENT_X")
-@ApiModel
-public class Department extends Model<Department> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 部门ID，主键
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "部门ID，主键")
-    private Long id;
-    /**
-     * 部门名称
-     */
-    @ApiModelProperty(value = "部门名称")
-    @TableField(condition = ToflySqlCondition.LIKE)
-    private String name;
-    /**
-     * 排序号
-     */
-    @ApiModelProperty(value = "排序号")
-    private Integer sort;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 修改时间
-     */
-    @ApiModelProperty(value = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "UPDATE_TIME", fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-    /**
-     * 是否启用禁用 1启用 2禁用
-     */
-    @ApiModelProperty(value = "是否启用禁用 1启用 2禁用")
-    private String statusFlag;
-    /**
-     * 父级部门ID
-     */
-    @ApiModelProperty(value = "父级部门ID")
-    private Integer parentId;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    /**
-     * 机构编码
-     */
-    @ApiModelProperty(value = "机构编码")
-    @TableField(condition = ToflySqlCondition.LIKE)
-    private String code;
-
-    @ApiModelProperty(value = "单位简称")
-    @TableField(condition = ToflySqlCondition.LIKE)
-    private String shortName;
-
-    @TableField(exist = false)
-    @ApiModelProperty(value = "父级部门")
-    private String parentName;
-
-    @ApiModelProperty(value = "标志")
-    private String statusName;
-}

hnls-admin/hnls-admin-api/src/main/java/com/tofly/pojo/Syschildcode.java

@@ -1,72 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-
-/**
- * 系统通用码表子级表
- *
- * @author wangjieliu
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-public class Syschildcode extends Model<Syschildcode> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 子级节点ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 父级节点ID
-     */
-    @ApiModelProperty(value = "父级节点ID")
-    private Long pcid;
-    /**
-     * 父级节点名称
-     */
-    @ApiModelProperty(value = "父级节点名称")
-    private String pcname;
-    /**
-     * 子级节点编码
-     */
-    @ApiModelProperty(value = "子级节点编码")
-    private String ccode;
-    /**
-     * 子级节点名称
-     */
-    @ApiModelProperty(value = "子级节点名称")
-    private String cname;
-    /**
-     * 子级节点内容
-     */
-    @ApiModelProperty(value = "子级节点内容")
-    private String ccontert;
-    /**
-     * 是否显示1显示，0不显示
-     */
-    @ApiModelProperty(value = "是否显示1显示，0不显示")
-    private String cdisable;
-    /**
-     * 排序
-     */
-    @ApiModelProperty(value = "排序")
-    private Long sort;
-    @ApiModelProperty(value = "1：系统编码,不可删；0：业务编码")
-    private String flag;
-
-}

hnls-admin/hnls-admin-api/src/main/java/com/tofly/pojo/Sysparentcode.java

@@ -1,44 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-
-/**
- * 系统通用码表父级表
- *
- * @author wangjieliu
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_SYSPARENTCODE_D", resultMap = "sysparentcodeMap")
-@KeySequence("TF_YWPN_SYSPARENTCODE_D")
-@ApiModel
-public class Sysparentcode extends Model<Sysparentcode> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 父级节点ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "父级节点ID")
-    private Long id;
-    /**
-     * 父级节点名称
-     */
-    @ApiModelProperty(value = "父级节点名称")
-    private String pcname;
-
-}

hnls-admin/hnls-admin-api/src/main/java/com/tofly/pojo/User.java

@@ -1,257 +0,0 @@
-package com.tofly.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.tofly.common.core.annotation.Excel;
-import com.tofly.mybatisplus.config.ToflySqlCondition;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @Author: 翘屁老猫
- * @Date: 2020/11/4 10:00
- */
-
-@Data
-@ApiModel
-public class User extends Model<User> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户ID，主键
-     */
-    @ApiModelProperty(value = "用户ID，主键")
-    private Long id;
-    /**
-     * 用户名
-     */
-    @ApiModelProperty(value = "用户名")
-    private String username;
-    /**
-     * 密码
-     */
-    @ApiModelProperty(value = "密码")
-    private String password;
-    /**
-     * 随机数
-     */
-    @ApiModelProperty(value = "随机数")
-    private String salt;
-    /**
-     * 电话
-     */
-    @ApiModelProperty(value = "电话")
-    @Excel(name = "phone")
-    private String phone;
-    /**
-     * 头像
-     */
-    @ApiModelProperty(value = "头像")
-    private String avatar;
-    /**
-     * 部门ID
-     */
-    @ApiModelProperty(value = "部门ID")
-    private Long departmentId;
-
-    @TableField(exist = false)
-    private String departmentName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME",fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 修改时间
-     */
-    @ApiModelProperty(value = "修改时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "UPDATE_TIME",fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-    /**
-     * 是否锁定，1正常，0锁定
-     */
-    @ApiModelProperty(value = "是否锁定，1正常，0锁定")
-    private String lockFlag;
-    /**
-     * 是否启用禁用，1启用，0禁用
-     */
-    @ApiModelProperty(value = "是否删除，1启用，0删除")
-    private String statusFlag;
-    /**
-     * 扩展功能，微信openid
-     */
-    @ApiModelProperty(value = "扩展功能，微信openid")
-    private String wxOpenid;
-    /**
-     * 扩展功能，QQ openid
-     */
-    @ApiModelProperty(value = "扩展功能，QQ openid")
-    private String qqOpenid;
-    /**
-     * 用户email
-     */
-    @ApiModelProperty(value = "用户email")
-    private String email;
-    /**
-     * 用户姓名
-     */
-    @ApiModelProperty(value = "用户姓名")
-    @TableField(condition = ToflySqlCondition.LIKE)
-    private String realName;
-    /**
-     * 最后一次登录时间
-     */
-    @ApiModelProperty(value = "最后一次登录时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date loginTime;
-    /**
-     * 最后一次访问IP
-     */
-    @ApiModelProperty(value = "最后一次访问IP")
-    private String lastIp;
-    /**
-     * 密码错误次数
-     */
-    @ApiModelProperty(value = "密码错误次数")
-    private Short pwderrtimes;
-    /**
-     * 工号
-     */
-    @ApiModelProperty(value = "工号")
-    private String worknumber;
-    /**
-     * 找回密码关键字
-     */
-    @ApiModelProperty(value = "找回密码关键字")
-    private String findpwdkey;
-    /**
-     * 别名
-     */
-    @ApiModelProperty(value = "别名")
-    private String aliasname;
-    /**
-     * 生日
-     */
-    @ApiModelProperty(value = "生日")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date birthday;
-    /**
-     * 属于（学院/部门）
-     */
-    @ApiModelProperty(value = "属于（学院/部门）")
-    private String belong;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER",fill = FieldFill.INSERT)
-    private Long createUser;
-
-    /**
-     * 电子签名图片
-     */
-    @ApiModelProperty(value = "电子签名图片")
-    private String esignature;
-
-    /**
-     * 用户级别
-     */
-    @ApiModelProperty(value = "用户级别")
-    private String userLevel;
-
-    /**
-     * 创建类型，0自建、1申请创建
-     */
-    @ApiModelProperty(value = "创建类型，0自建、1申请创建")
-    private String createType;
-
-    /**
-     * 首次登陆状态,1 首次登录,0 非首次登录
-     */
-    @ApiModelProperty(value = "首次登陆状态,1 首次登录,0 非首次登录")
-    private String firstlog;
-
-    /**
-     * 申请人
-     */
-    @ApiModelProperty(value = "申请人")
-    private String applyer;
-
-    /**
-     * 申请时间
-     */
-    @ApiModelProperty(value = "申请时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date applytime;
-
-    /**
-     * 申请说明
-     */
-    @ApiModelProperty(value = "申请说明")
-    private String applystate;
-
-    /**
-     * 审核人
-     */
-    @ApiModelProperty(value = "审核人")
-    private String auditor;
-
-    /**
-     * 用户账号详情
-     */
-    @ApiModelProperty(value = "用户账号详情")
-    private String accountstate;
-
-    /**
-     * 审核时间
-     */
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date audittime;
-
-    /**
-     * 审核说明
-     */
-    @ApiModelProperty(value = "审核说明")
-    private String auditstate;
-
-    /**
-     * 审核状态,1 未审核,2 同意, 0 不同意
-     */
-    @ApiModelProperty(value = "审核状态,1 未审核,2 同意, 0 不同意")
-    private String auditstatus;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value = "备注")
-    private String note;
-
-    /**
-     * 岗位
-     */
-    @ApiModelProperty(value = "岗位")
-    private String job;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value = "是否启用禁用，1启用，0禁用")
-    private String enableFlag;
-
-}

hnls-admin/hnls-admin-api/src/main/java/com/tofly/pojo/message/Messagepush.java

@@ -1,103 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.message;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 消息推送数据表:TF_YWPN_MESSAGEPUSH_W
- *
- * @author admin
- * @date Wed Mar 31 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_MESSAGEPUSH_W", resultMap = "messagepushMap")
-@KeySequence("TF_YWPN_MESSAGEPUSH_W")
-@ApiModel
-public class Messagepush extends Model<Messagepush> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一编码
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "唯一编码")
-    private Long id;
-    /**
-     * 消息主题
-     */
-    @ApiModelProperty(value = "消息主题")
-    private String topic;
-    /**
-     * 消息详情
-     */
-    @ApiModelProperty(value = "消息详情")
-    private String message;
-    /**
-     * 回复的原消息ID
-     */
-    @ApiModelProperty(value = "回复的原消息ID")
-    private Long replyId;
-    /**
-     * 消息类型：0普通消息 1抢维修 2巡检 3工地 4隐患 5管网工单  6业务工单 7基础数据处理 0001上报 0002审核
-     */
-    @ApiModelProperty(value = "消息类型：0普通消息 1抢维修 2巡检 3工地 4隐患 5管网工单  6业务工单 7基础数据处理 0001上报 0002审核 12业务工单")
-    private String type;
-
-    /**
-     * 消息链接表名
-     */
-    @ApiModelProperty(value = "消息链接表名")
-    private String tableName;
-    /**
-     * 链接ID
-     */
-    @ApiModelProperty(value = "链接ID")
-    private Long tableId;
-    /**
-     * 路由地址进行跳转
-     */
-    @ApiModelProperty(value = "路由地址进行跳转")
-    private String routeIp;
-    /**
-     * APP路由地址进行跳转
-     */
-    @ApiModelProperty(value = "APP路由地址进行跳转")
-    private String routeIpApp;
-
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @TableField(exist = false)
-@ApiModelProperty(hidden = true)
-    private String createUserName;
-
-    @ApiModelProperty("是否加急 0否 1是")
-    private String isEmergency;
-
-}

hnls-admin/hnls-admin-api/src/main/java/com/tofly/pojo/message/Messagerecipient.java

@@ -1,63 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.message;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W
- *
- * @author admin
- * @date Wed Mar 31 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_MESSAGERECIPIENT_W", resultMap = "messagerecipientMap")
-@KeySequence("TF_YWPN_MESSAGERECIPIENT_W")
-@ApiModel
-public class Messagerecipient extends Model<Messagerecipient> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 唯一编码
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "唯一编码")
-    private Long id;
-    /**
-     * 消息表主键，TF_YWPN_MESSAGEPUSH_W
-     */
-    @ApiModelProperty(value = "消息表主键，TF_YWPN_MESSAGEPUSH_W")
-    private Long messageId;
-    /**
-     * 消息接收人
-     */
-    @ApiModelProperty(value = "消息接收人")
-    private Long recipient;
-    /**
-     * 消息是否接收，0：未接收，1：已接收
-     */
-    @ApiModelProperty(value = "消息是否接收，0：未接收，1：已接收")
-    private String flag;
-    /**
-     * 消息接收时间
-     */
-    @ApiModelProperty(value = "消息接收时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date recipientTime;
-
-}

hnls-admin/hnls-admin-api/src/main/java/com/tofly/pojo/message/Usertask.java

@@ -1,129 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.pojo.message;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-/**
- * 待办任务信息表
- *
- * @author admin
- * @date Wed Mar 31 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_USERTASK_W", resultMap = "usertaskMap")
-@KeySequence("TF_YWPN_USERTASK_W")
-@ApiModel
-public class Usertask extends Model<Usertask> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 任务结束时间
-     */
-    @ApiModelProperty(value = "任务结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
-    /**
-     * 任务开始时间
-     */
-    @ApiModelProperty(value = "任务开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-    /**
-     * 主键ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-    /**
-     * 名称描述
-     */
-    @ApiModelProperty(value = "名称描述")
-    private String tknm;
-    /**
-     * 待办类型大类，根据发起的任务进行分类，如：1巡检任务、2抢维修任务
-     */
-    @ApiModelProperty(value = "待办类型大类，根据发起的任务进行分类，如：1巡检任务、2抢维修任务")
-    private String tkty;
-    /**
-     * 待办任务子类，如：1_1管线巡查
-     */
-    @ApiModelProperty(value = "待办任务子类，如：1_1管线巡查")
-    private String tksmty;
-    /**
-     * 级别：0一般、1紧急
-     */
-    @ApiModelProperty(value = "级别：0一般、1紧急")
-    private String tlevel;
-    /**
-     * 任务链接表名
-     */
-    @ApiModelProperty(value = "任务链接表名")
-    private String tableName;
-    /**
-     * 链接ID
-     */
-    @ApiModelProperty(value = "链接ID")
-    private Long tableId;
-    /**
-     * 路由地址进行跳转
-     */
-    @ApiModelProperty(value = "路由地址进行跳转")
-    private String routeIp;
-    /**
-     * app路由地址进行跳转
-     */
-    @ApiModelProperty(value = "app路由地址进行跳转")
-    private String routeAppIp;
-    /**
-     * 处理状态：0待完成，1已完成
-     */
-    @ApiModelProperty(value = "处理状态：0待完成，1已完成,2未开始,3已超时")
-    private String ishandle;
-    /**
-     * 处理时间
-     */
-    @ApiModelProperty(value = "处理时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date handleTime;
-    /**
-     * 处理人ID
-     */
-    @ApiModelProperty(value = "处理人ID")
-    private Long handleUser;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @TableField(exist = false)
-@ApiModelProperty(hidden = true)
-    private String createUserName;
-
-}

hnls-admin/hnls-admin-service/pom.xml

@@ -1,78 +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>
-        <groupId>com.tofly</groupId>
-        <artifactId>hnls-admin</artifactId>
-        <version>1.0.0</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
-    <artifactId>hnls-admin-service</artifactId>
-    <version>1.0.0</version>
-    <dependencies>
-        <!-- xxl-job -->
-        <dependency>
-            <groupId>com.tofly</groupId>
-            <artifactId>common-entity</artifactId>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.xuxueli</groupId>
-            <artifactId>xxl-job-core</artifactId>
-            <version>2.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.tofly</groupId>
-            <artifactId>hnls-admin-api</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.thymeleaf</groupId>
-            <artifactId>thymeleaf-spring5</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.tofly</groupId>
-            <artifactId>common-ftp</artifactId>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.tofly</groupId>
-            <artifactId>common-redis</artifactId>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.tofly</groupId>
-            <artifactId>common-log</artifactId>
-            <version>1.0.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>3.3.2</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/BaseApplication.java

@@ -1,20 +0,0 @@
-package com.tofly.base;
-
-import com.tofly.baseapi.config.ToflyWebColudApplication;
-import org.springframework.boot.SpringApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.context.annotation.ComponentScan;
-
-/**
- * @author Administrator
- * @date 2019/9/4  15:50
- */
-
-
-@ToflyWebColudApplication
-@EnableDiscoveryClient
-public class BaseApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(BaseApplication.class, args);
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/config/Constant.java

@@ -1,36 +0,0 @@
-package com.tofly.base.config;
-
-/**
- * @ClassName: Constant
- * @Description: 常量
- * @Author Zev
- * @Date 2021/3/18
- * @Version 1.0.0
- */
-public class Constant {
-    public static final String CSV = ",";
-    public static int COMPANY_NAME_IS_EMPTY_CODE = 20101;
-    public static String COMPANY_NAME_IS_EMPTY = "单位名称为空";
-
-    public static int CURRENT_UNIT_ALREADY_EXISTS_CODE = 20102;
-    public static String CURRENT_UNIT_ALREADY_EXISTS = "当前单位已存在";
-
-    public static int COMPANY_EXISTING_CHILD_CODE = 20103;
-    public static String COMPANY_EXISTING_CHILD = "当前单位下还存在子集";
-
-    public static int PARENT_RELATIONSHIP_CANNOT_MODIFIED_CODE = 20104;
-    public static String PARENT_RELATIONSHIP_CANNOT_MODIFIED = "不能修改总公司上下级关系";
-
-    public static int PARENT_RELATIONSHIP_CANNOT_DISABLE_CODE = 20105;
-    public static String PARENT_RELATIONSHIP_CANNOT_DISABLE = "不能禁用总公司";
-
-    public static int DEPARTMENT_NAME_COMPANY_IS_EMPTY_CODE = 20201;
-    public static String DEPARTMENT_NAME_COMPANY_IS_EMPTY = "部门名称为空或未绑定单位";
-
-    public static int CURRENT_DEPARTMENT_ALREADY_EXISTS_CODE = 20202;
-    public static String CURRENT_DEPARTMENT_ALREADY_EXISTS = "当前部门已存在";
-
-    public static int DEPARTMENT_EXISTING_CHILD_CODE = 20203;
-    public static String DEPARTMENT_EXISTING_CHILD = "当前部门下还存在子集";
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/config/FilePathBean.java

@@ -1,33 +0,0 @@
-package com.tofly.base.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * @author wangjieliu
- * @date 2020/10/23 15:59
- */
-@Data
-@Component
-@ConfigurationProperties(prefix = "xrty.ftp")
-public class FilePathBean {
-//    /**
-//     * 热线交班管理文件
-//     */
-//    private String jbFile;
-//    /**
-//     * 热线知识库文件
-//     */
-//    private String knowledgeFile;
-//    /**
-//     * 上报问题的文件
-//     */
-//    private String problemFile;
-//    /**
-//     * 热线应急服务文件
-//     */
-//    private String emergencyFile;
-
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/config/FilePathExcel.java

@@ -1,23 +0,0 @@
-package com.tofly.base.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * @author fcl
- * @date 2021/3/11 15:31
- */
-@Data
-@Component
-@ConfigurationProperties(prefix = "xrty.ftp")
-public class FilePathExcel {
-    /**
-     * Excel模板
-     */
-    private String excelmb;
-    /**
-     * Excel模板
-     */
-    private String ip;
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/config/MybatisPlusConfigurer.java

@@ -1,30 +0,0 @@
-package com.tofly.base.config;
-
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.springframework.context.annotation.Bean;
-
-/**
- * @author Administrator
- * @date 2019/9/4  15:58
- */
-//@Configuration
-public class MybatisPlusConfigurer {
-
-    /**
-     * 分页插件
-     *
-     */
-    @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        return new PaginationInterceptor();
-    }
-
-   /* *//**
-     * oracle 配置自增
-     * @return
-     *//*
-    @Bean
-    public OracleKeyGenerator oracleKeyGenerator(){
-        return new OracleKeyGenerator();
-    }*/
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/config/TokenStoreConfiguration.java

@@ -1,24 +0,0 @@
-package com.tofly.base.config;
-
-import com.tofly.common.core.constant.SecurityConstants;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
-import org.springframework.security.oauth2.provider.token.TokenStore;
-import org.springframework.security.oauth2.provider.token.store.redis.RedisTokenStore;
-
-@Configuration
-@AllArgsConstructor
-@Slf4j
-public class TokenStoreConfiguration {
-    private final RedisConnectionFactory redisConnectionFactory;
-    @Bean
-    public TokenStore tokenStore() {
-        RedisTokenStore tokenStore = new RedisTokenStore(redisConnectionFactory);
-        tokenStore.setPrefix(SecurityConstants.PROJECT_PREFIX + SecurityConstants.OAUTH_PREFIX);
-        return tokenStore;
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/config/WebSecurityConfiguration.java

@@ -1,47 +0,0 @@
-package com.tofly.base.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
-
-/*@EnableWebSecurity
-@Configuration*/
-public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
-
-
-    @Bean
-    public PasswordEncoder passwordEncoder() {
-        return new BCryptPasswordEncoder();
-    }
-
-
-
-    @Override
-    public void configure(WebSecurity web) throws Exception {
-        web.ignoring().antMatchers("/webjars/**","/resources/**");
-
-    }
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-                .authorizeRequests()
-                .antMatchers(
-                        "/user/info/**","/user/role",
-                        "/log**"
-                       ).permitAll()
-                .anyRequest().authenticated()
-                .and().csrf().disable();
-    }
-
-    @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.userDetailsService(userDetailsServiceBean())
-        .passwordEncoder(passwordEncoder());
-    }
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/config/XxlJobConfig.java

@@ -1,78 +0,0 @@
-package com.tofly.base.config;
-
-import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * xxl-job config
- *
- * @author xuxueli 2017-04-28
- */
-@Configuration
-public class XxlJobConfig {
-    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
-
-    @Value("${xxl.job.admin.addresses}")
-    private String adminAddresses;
-
-//    @Value("${xxl.job.accessToken}")
-//    private String accessToken;
-
-    @Value("${xxl.job.executor.appname}")
-    private String appname;
-
-//    @Value("${xxl.job.executor.address}")
-//    private String address;
-//
-//    @Value("${xxl.job.executor.ip}")
-//    private String ip;
-
-    @Value("${xxl.job.executor.port}")
-    private int port;
-
-    @Value("${xxl.job.executor.logpath}")
-    private String logPath;
-
-    @Value("${xxl.job.executor.logretentiondays}")
-    private int logRetentionDays;
-
-
-    @Bean
-    public XxlJobSpringExecutor xxlJobExecutor() {
-        logger.info(">>>>>>>>>>> xxl-job config init.");
-        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
-        xxlJobSpringExecutor.setAppname(appname);
-//        xxlJobSpringExecutor.setAddress(address);
-//        xxlJobSpringExecutor.setIp(ip);
-        xxlJobSpringExecutor.setPort(port);
-//        xxlJobSpringExecutor.setAccessToken(accessToken);
-        xxlJobSpringExecutor.setLogPath(logPath);
-        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
-
-        return xxlJobSpringExecutor;
-    }
-
-    /**
-     * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
-     *
-     *      1、引入依赖：
-     *          <dependency>
-     *             <groupId>org.springframework.cloud</groupId>
-     *             <artifactId>spring-cloud-commons</artifactId>
-     *             <version>${version}</version>
-     *         </dependency>
-     *
-     *      2、配置文件，或者容器启动变量
-     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
-     *
-     *      3、获取IP
-     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
-     */
-
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/AppController.java

@@ -1,194 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.core.util.StringUtil;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import com.tofly.base.entity.App;
-import com.tofly.base.service.AppService;
-
-import com.tofly.common.oauth.util.SecurityUtils;
-import lombok.AllArgsConstructor;
-
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.multipart.MultipartFile;
-
-
-import java.util.*;
-
-/**
- * APP管理
- *
- * @author fcl
- * @date Wed Mar 10 00:00:00 CST 2021
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/app")
-@Api(tags="APP管理接口")
-public class AppController {
-
-    private final  AppService appService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param app
-    * @return
-    */
-    @GetMapping("/page" )
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getAppPage(Page page, @ModelAttribute App app) {
-      return ResultRespone.success(appService.page(page, Wrappers.query(app)));
-    }
-
-
-    /**
-     * 通过id查询
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(appService.getById(id));
-    }
-
-    /**
-     * 新增
-     * @param app
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增" )
-    @ApiOperation(value = "新增")
-    @PostMapping
-    public ResultRespone save(@RequestBody App app) {
-      return ResultRespone.success(appService.save(app));
-    }
-
-    /**
-     * 修改
-     * @param app
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改" )
-    @ApiOperation(value = "修改(发布即是修改发布状态)")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody App app) {
-        app.setReleasestatus("2");
-        app.setReleaser(SecurityUtils.getUserId());
-        app.setReleasetime(new Date());
-        return ResultRespone.success(appService.updateById(app));
-    }
-    /**
-     * 通过id删除$
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除" )
-    @ApiOperation(value = "通过ID删除")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-      return ResultRespone.success(appService.removeById(id));
-    }
-
-    /**
-     * 通过id批量删除
-     * @param ids id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id批量删除" )
-    @ApiOperation(value = "通过ID批量删除")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "批量删除，多个id以逗号隔开", required = true, dataType = "String")
-    })
-    @DeleteMapping("/deleteByIds" )
-    public ResultRespone removeById(String ids) {
-        return ResultRespone.success(appService.removeByIds(Arrays.asList(ids.split(","))));
-    }
-    /**
-     *
-     * APP包上传
-     */
-    @ToFlyAppLog(title="APP包上传" )
-    @ApiOperation(value = "APP包上传")
-    @PutMapping("upLoadApp")
-    public ResultRespone upLoadApp(@RequestParam("appFile")MultipartFile appFile,@RequestParam("txtFile")MultipartFile txtFile ,@RequestParam("type")String type) throws Exception {
-        return ResultRespone.success(appService.upLoadApp(appFile,txtFile,type),type);
-    }
-
-
-    /**
-     *
-     * APP版本号获取
-     */
-    @GetMapping("/getVersion" )
-    @ApiOperation(value = "当前APP版本号获取")
-    public ResultRespone getVersion(@RequestParam("type")String type){
-        return ResultRespone.success(appService.selectOldApp(type));
-    }
-
-    /**
-     * app下载路径
-     *
-     * @return ResultRespone
-     */
-    @GetMapping(value = "/appDownlod")
-    @ApiOperation(value = "app下载路径", notes = "app下载路径")
-    public ResultRespone appDownlod(String type) throws Exception {
-        return ResultRespone.success(appService.appDownlod(type));
-    }
-
-    /**
-     * 分页查询
-     * @param page 分页对象
-     * @return
-     */
-
-    @GetMapping("/pageNew" )
-    @ApiOperation(value = "分页查询-根据类型和日期查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "type", value = "类型", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "releasestatus", value = "状态", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "startDate", value = "开始日期", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "endDate", value = "结束日期", required = false, dataType = "String")
-    })
-    public ResultRespone getAppPageNew(Page page,String releasestatus,String startDate,String endDate,String type ) {
-
-        Map map=new HashMap();
-        map.put("releaseStatus",releasestatus);
-        map.put("type",type);
-        map.put("startDate", StringUtil.isEmpty(startDate)?null:startDate+" 00:00:00");
-        map.put("endDate",StringUtil.isEmpty(endDate)?null:endDate+" 23:59:59");
-        return ResultRespone.success(appService.listAppPage(page,map));
-
-    }
-
-    /**
-     *
-     * 获取最新的一条app上传信息
-     */
-    @GetMapping("/getNewVersionInformation" )
-    @ApiOperation(value = "获取最新的一条app上传信息")
-    public ResultRespone getNewVersionInformation(@RequestParam(value = "type") String type, @RequestParam(value = "userId",required = false) String userId, @RequestParam(value = "nowVersion",required = false) String nowVersion){
-        return appService.getNewVersionInformation(type ,userId, nowVersion);
-    }
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/BaseRolesysController.java

@@ -1,167 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-//package com.tofly.base.controller;
-//
-//import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.tofly.base.entity.BaseRolesys;
-//import com.tofly.base.entity.UserRole;
-//import com.tofly.base.service.BaseRolesysService;
-//import com.tofly.base.service.UserRoleService;
-//import com.tofly.common.core.entity.ResultRespone;
-//import com.tofly.common.log.annotation.ToFlyAppLog;
-//import com.tofly.common.oauth.util.SecurityUtils;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiImplicitParam;
-//import io.swagger.annotations.ApiImplicitParams;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.AllArgsConstructor;
-//import org.springframework.web.bind.annotation.*;
-//
-//import java.util.*;
-//import java.util.stream.Collectors;
-//
-///**
-// * @author wangjian
-// * @date Mon Jun 22 00:00:00 CST 2020
-// */
-//@RestController
-//@AllArgsConstructor
-//@RequestMapping("/baserolesys")
-//@Api(tags = "角色绑定系统接口")
-//public class BaseRolesysController {
-//
-//    private final BaseRolesysService baseRolesysService;
-//
-//    private final UserRoleService userRoleService;
-//
-//    /**
-//     * 分页查询
-//     *
-//     * @param page        分页对象
-//     * @param baseRolesys
-//     * @return
-//     */
-//    @GetMapping("/page")
-//    @ApiOperation(value = "分页查询")
-//    public ResultRespone getBaseRolesysPage(Page page, @ModelAttribute BaseRolesys baseRolesys) {
-//        return ResultRespone.success(baseRolesysService.page(page, Wrappers.query(baseRolesys)));
-//    }
-//
-//
-//    /**
-//     * 通过id查询
-//     *
-//     * @param id id
-//     * @return ResultRespone
-//     */
-//    @GetMapping("/{id}")
-//    @ApiOperation(value = "通过ID查询")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-//    })
-//    public ResultRespone getById(@PathVariable("id") Long id) {
-//        return ResultRespone.success(baseRolesysService.getById(id));
-//    }
-//
-//    @GetMapping("/list")
-//    @ApiOperation(value = "查询角色系统信息")
-//    public ResultRespone list(@ModelAttribute BaseRolesys baseRolesys) {
-//        List<BaseRolesys> list = baseRolesysService.list(Wrappers.query(baseRolesys));
-//        List<Map> collect = list.stream().map(baseRolesys1 -> {
-//            Map map = new HashMap();
-//            map.put("sysid", baseRolesys1.getSysid());
-//            map.put("sysids", baseRolesys1.getSysids().split(","));
-//            return map;
-//        }).collect(Collectors.toList());
-//        return ResultRespone.success(collect);
-//    }
-//
-//    @GetMapping("/userlist")
-//    @ApiOperation(value = "查询用户系统信息")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "sysId", value = "子系统id", required = true, dataType = "String")
-//    })
-//    public ResultRespone userlist(String sysId) {
-//        List<UserRole> list = userRoleService.list(Wrappers.<UserRole>lambdaQuery()
-//                .eq(UserRole::getUserId, SecurityUtils.getUserId()));
-//
-//        List<BaseRolesys> list1 = baseRolesysService.list(Wrappers.<BaseRolesys>lambdaQuery()
-//                .eq(BaseRolesys::getSysid, sysId)
-//                .in(BaseRolesys::getRoleId, Arrays.asList(list.stream().mapToLong(UserRole::getRoleId).toArray())));
-//        Set<String> set = new HashSet<>();
-//        list1.stream().forEach(baserole -> {
-//            String sysids = baserole.getSysids();
-//            String[] split = sysids.split(",");
-//            set.addAll(Arrays.asList(split));
-//        });
-//        return ResultRespone.success(set);
-//    }
-//
-//    /**
-//     * 新增
-//     *
-//     * @param baseRolesys
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title = "更新角色系统")
-//    @ApiOperation(value = "更新角色系统")
-//    @PostMapping
-//    public ResultRespone save(@RequestBody BaseRolesys baseRolesys) {
-//        BaseRolesys baseSys1 = baseRolesysService.getOne(Wrappers.<BaseRolesys>lambdaQuery()
-//                .eq(BaseRolesys::getSysid, baseRolesys.getSysid())
-//                .eq(BaseRolesys::getRoleId, baseRolesys.getRoleId()));
-//        if (baseSys1 == null) {
-//            return ResultRespone.success(baseRolesysService.save(baseRolesys));
-//        }
-//        baseRolesys.setId(baseSys1.getId());
-//        return ResultRespone.success(baseRolesysService.updateById(baseRolesys));
-//    }
-//
-//    /**
-//     * 修改
-//     *
-//     * @param baseRolesys
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title = "修改")
-//    @ApiOperation(value = "修改")
-//    @PutMapping
-//    public ResultRespone updateById(@RequestBody BaseRolesys baseRolesys) {
-//        return ResultRespone.success(baseRolesysService.updateById(baseRolesys));
-//    }
-//
-//    /**
-//     * 通过id删除
-//     *
-//     * @param id id
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title = "通过id删除")
-//    @ApiOperation(value = "通过ID删除")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-//    })
-//    @DeleteMapping("/{id}")
-//    public ResultRespone removeById(@PathVariable Long id) {
-//        return ResultRespone.success(baseRolesysService.removeById(id));
-//    }
-//
-//    /**
-//     * 通过id批量删除
-//     *
-//     * @param ids id
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title = "通过id批量删除")
-//    @ApiOperation(value = "通过ID批量删除")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "ids", value = "批量删除，多个id以逗号隔开", required = true, dataType = "String")
-//    })
-//    @DeleteMapping("/deleteByIds")
-//    public ResultRespone removeById(String ids) {
-//        return ResultRespone.success(baseRolesysService.removeByIds(Arrays.asList(ids.split(","))));
-//    }
-//}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/BaseSysController.java

@@ -1,116 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import com.tofly.base.entity.BaseSys;
-import com.tofly.base.service.BaseSysService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import org.springframework.web.bind.annotation.ModelAttribute;
-
-import java.util.Arrays;
-/**
- * 
- *
- * @author wangjian
- * @date Tue Jul 07 00:00:00 CST 2020
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/basesys")
-@Api(tags="系统接口")
-public class BaseSysController {
-
-    private final  BaseSysService baseSysService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param baseSys 
-    * @return
-    */
-    @GetMapping("/page" )
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getBaseSysPage(Page page, @ModelAttribute BaseSys baseSys) {
-      return ResultRespone.success(baseSysService.page(page, Wrappers.query(baseSys).lambda().orderByAsc(BaseSys::getCreateTime)));
-    }
-
-
-    /**
-     * 通过id查询
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(baseSysService.getById(id));
-    }
-
-    /**
-     * 新增
-     * @param baseSys 
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增" )
-    @ApiOperation(value = "新增")
-    @PostMapping
-    public ResultRespone save(@RequestBody BaseSys baseSys) {
-      return ResultRespone.success(baseSysService.save(baseSys));
-    }
-
-    /**
-     * 修改
-     * @param baseSys 
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改" )
-    @ApiOperation(value = "修改")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody BaseSys baseSys) {
-      return ResultRespone.success(baseSysService.updateById(baseSys));
-    }
-
-    /**
-     * 通过id删除
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除" )
-    @ApiOperation(value = "通过ID删除")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-      return ResultRespone.success(baseSysService.removeById(id));
-    }
-
-    /**
-     * 通过id批量删除
-     * @param ids id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id批量删除" )
-    @ApiOperation(value = "通过ID批量删除")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "批量删除，多个id以逗号隔开", required = true, dataType = "String")
-    })
-    @DeleteMapping("/deleteByIds" )
-    public ResultRespone removeByIds(String ids) {
-        return ResultRespone.success(baseSysService.removeByIds(Arrays.asList(ids.split(","))));
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/BaseSysmenuController.java

@@ -1,167 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.tofly.base.entity.BaseSysmenu;
-import com.tofly.base.entity.MySysMenu;
-import com.tofly.base.service.BaseSysmenuService;
-import com.tofly.common.core.entity.ResultRespone;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @author wangjian
- * @date Mon Jul 06 00:00:00 CST 2020
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/basesysmenu")
-@Api(tags = "系统菜单接口")
-public class BaseSysmenuController {
-
-    private final BaseSysmenuService baseSysmenuService;
-
-//    @PostMapping("/updateSysmenu")
-//    @ApiOperation(value = "系统菜单更新")
-//    public ResultRespone updateSysmenu(@RequestBody Map map) {
-//        return ResultRespone.success(baseSysmenuService.updateSysmenu(map));
-//    }
-//
-//
-//    @GetMapping("/getChirenMenuNew")
-//    @ApiOperation(value = "获取本地子系统列表新")
-//    public ResultRespone getChirenMenuNew() {
-//        List<BaseSysmenu> list = baseSysmenuService.list(Wrappers.<BaseSysmenu>lambdaQuery()
-//                        .isNull(BaseSysmenu::getParentPathid)
-//                        .isNotNull(BaseSysmenu::getSysid)
-////                .inSql(BaseSysmenu::getSysid, "select sysId from TF_BASE_SYS where type = 'tofly-master'")
-//        );
-//        List list1 = list.stream().sorted(Comparator.comparing(BaseSysmenu::getSysid).thenComparing(BaseSysmenu::getId)).collect(Collectors.toList());
-//        return ResultRespone.success(list1);
-//    }
-//
-//    @GetMapping("/getOneChirenMenuNew")
-//    @ApiOperation(value = "获取本地单个子系统功能列表新")
-//    public ResultRespone getOneChirenMenuNew(String sysId,String pathId) {
-//        List<BaseSysmenu> list = baseSysmenuService.list(Wrappers.<BaseSysmenu>lambdaQuery()
-////                .inSql(BaseSysmenu::getSysid, "select sysId from TF_BASE_SYS where type = 'tofly-master'")
-//                        .eq(BaseSysmenu::getSysid, sysId)
-//        );
-//        List<MySysMenu> treeSys = baseSysmenuService.getTreeSys(list);
-//        List<MySysMenu> collect = treeSys.stream().filter(sys -> sys.getPathId().equals(pathId)).collect(Collectors.toList());
-//        return ResultRespone.success(collect.get(0).getChildren());
-//    }
-//
-//
-//    @GetMapping("/getChirenMenu")
-//    @ApiOperation(value = "获取本地子系统列表")
-//    public ResultRespone getChirenMenu() {
-//        List<BaseSysmenu> list = baseSysmenuService.list(Wrappers.<BaseSysmenu>lambdaQuery()
-//                .isNull(BaseSysmenu::getParentPathid)
-//                .inSql(BaseSysmenu::getSysid, "select sysId from TF_BASE_SYS where type = 'tofly-master'")
-//        );
-//        return ResultRespone.success(list);
-//    }
-//
-//    @GetMapping("/getOneChirenMenu")
-//    @ApiOperation(value = "获取本地单个子系统功能列表")
-//    public ResultRespone getOneChirenMenu(String pathId) {
-//        List<BaseSysmenu> list = baseSysmenuService.list(Wrappers.<BaseSysmenu>lambdaQuery()
-//                .inSql(BaseSysmenu::getSysid, "select sysId from TF_BASE_SYS where type = 'tofly-master'"));
-//        List<MySysMenu> treeSys = baseSysmenuService.getTreeSys(list);
-//        List<MySysMenu> collect = treeSys.stream().filter(sys -> sys.getPathId().equals(pathId)).collect(Collectors.toList());
-//        return ResultRespone.success(collect.get(0).getChildren());
-//    }
-//
-
-//    /**
-//    * 分页查询
-//    * @param page 分页对象
-//    * @param baseSysmenu
-//    * @return
-//    */
-//    @GetMapping("/page" )
-//    @ApiOperation(value = "分页查询")
-//    public ResultRespone getBaseSysmenuPage(Page page, @ModelAttribute BaseSysmenu baseSysmenu) {
-//      return ResultRespone.success(baseSysmenuService.page(page, Wrappers.query(baseSysmenu)));
-//    }
-//
-//
-//    /**
-//     * 通过id查询
-//     * @param id id
-//     * @return ResultRespone
-//     */
-//    @GetMapping("/{id}" )
-//    @ApiOperation(value = "通过ID查询")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-//    })
-//    public ResultRespone getById(@PathVariable("id" ) Long id) {
-//      return ResultRespone.success(baseSysmenuService.getById(id));
-//    }
-//
-//    /**
-//     * 新增
-//     * @param baseSysmenu
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title="新增" )
-//    @ApiOperation(value = "新增")
-//    @PostMapping
-//    public ResultRespone save(@RequestBody BaseSysmenu baseSysmenu) {
-//      return ResultRespone.success(baseSysmenuService.save(baseSysmenu));
-//    }
-//
-//    /**
-//     * 修改
-//     * @param baseSysmenu
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title="修改" )
-//    @ApiOperation(value = "修改")
-//    @PutMapping
-//    public ResultRespone updateById(@RequestBody BaseSysmenu baseSysmenu) {
-//      return ResultRespone.success(baseSysmenuService.updateById(baseSysmenu));
-//    }
-//
-//    /**
-//     * 通过id删除
-//     * @param id id
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title="通过id删除" )
-//    @ApiOperation(value = "通过ID删除")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-//    })
-//    @DeleteMapping("/{id}" )
-//    public ResultRespone removeById(@PathVariable Long id) {
-//      return ResultRespone.success(baseSysmenuService.removeById(id));
-//    }
-//
-//    /**
-//     * 通过id批量删除
-//     * @param ids id
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title="通过id批量删除" )
-//    @ApiOperation(value = "通过ID批量删除")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "ids", value = "批量删除，多个id以逗号隔开", required = true, dataType = "String")
-//    })
-//    @DeleteMapping("/deleteByIds" )
-//    public ResultRespone removeById(String ids) {
-//        return ResultRespone.success(baseSysmenuService.removeByIds(Arrays.asList(ids.split(","))));
-//    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/CodeController.java

@@ -1,230 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-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.tofly.base.entity.Code;
-import com.tofly.base.service.CodeService;
-import com.tofly.common.core.constant.CommonConstants;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.core.util.SpringContextHolder;
-import com.tofly.common.core.util.StringUtil;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import io.swagger.annotations.*;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 系统码表
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/code")
-@Api(tags="系统码表接口")
-public class CodeController {
-
-    private final  CodeService codeService;
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param code 系统码表
-    * @return
-    */
-    @GetMapping("/page" )
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getCodePage(Page page, @ModelAttribute Code code) {
-      return ResultRespone.success(codeService.page(page, Wrappers.query(code)));
-    }
-
-    /**
-     * 通过key查询系统码表
-     * @param keys key
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过key和ulevel查询系统码表" )
-    @ApiOperation(value = "通过key和ulevel查询系统码表")
-    @GetMapping("/getByKeys" )
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "keys", value = "key", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "ulevel", value = "级别  1字典类级别，2系统类级别", required = true, dataType = "String")
-    })
-    public ResultRespone selectByKeyAndUlevel( String keys, String ulevel) {
-            String[] keyss = keys.split(",");
-            List<Code> list = codeService.list(Wrappers.<Code>lambdaQuery().in(Code::getKey, Arrays.asList(keyss)));
-        if ("".equals(ulevel)) {
-            Map<String, List<Code>> map = list.stream().collect(Collectors.toMap(Code::getKey, c -> new ArrayList<Code>() {{
-                add(c);
-            }}, (List<Code> c1, List<Code> c2) -> {
-                c1.addAll(c2);
-                return c1;
-            }));
-//        Map map=new HashMap();
-//        for(String key:keyss){
-//           map.put(key,codeService.list(Wrappers.<Code>lambdaQuery().eq(Code::getKey,key)));
-//        }
-            return ResultRespone.success(map);
-        }
-        Map<String,List<Code>> listMap = list.stream().collect(Collectors.groupingBy(Code::getUlevel));
-        return ResultRespone.success(listMap);
-    }
-
-
-
-    /**
-     * 通过id查询系统码表
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(codeService.getById(id));
-    }
-
-    /**
-     * 新增系统码表
-     * @param code 系统码表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增系统码表" )
-    @ApiOperation(value = "新增系统码表")
-    @PostMapping
-    public ResultRespone save(@RequestBody Code code) {
-        String ulevel = code.getUlevel();
-        Wrapper<Code> wrapper=Wrappers.<Code>lambdaQuery()
-                .eq(Code::getUlevel,code.getUlevel())
-                .eq(Code::getKey,code.getKey());
-        String msg=null;
-
-        if("1".equals(ulevel)){
-            Code c=codeService.getOne(wrapper);
-            if(c!=null){
-                msg="抱歉，已存在相同字典值："+code.getKey();
-            }
-        }else if("2".equals(ulevel)){
-            Code c= codeService.getOne(((LambdaQueryWrapper<Code>) wrapper).eq(Code::getValue,code.getValue()));
-            if(c!=null){
-                msg="抱歉，已存在相同字典值："+code.getValue()+"（"+c.getNotes()+")";
-            }
-        }
-        if(StringUtil.isEmpty(msg)){
-            boolean b=codeService.save(code);
-            //推送到工作流
-            if(b&& CommonConstants.POSTIONKEY.equals(code.getKey()) &&
-             "2".equals(ulevel)){
-                Map map = new HashMap();
-                map.put("value",code.getValue());
-                map.put("notes",code.getNotes());
-//                SpringContextHolder.publishEvent(new FlowableAddUserGroupEvent(map));
-            }
-
-            return ResultRespone.success(true);
-        }else{
-            return ResultRespone.failed(msg);
-        }
-
-    }
-
-    /**
-     * 修改系统码表
-     * @param code 系统码表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改系统码表" )
-    @ApiOperation(value = "修改系统码表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody Code code) {
-        boolean b = codeService.updateById(code);
-        if(b && CommonConstants.POSTIONKEY.equals(code.getKey()) &&
-                "2".equals(code.getUlevel()) && !StringUtil.isEmpty(code.getNotes())){
-            Map map = new HashMap();
-            map.put("value",code.getValue());
-            map.put("notes",code.getNotes());
-//            SpringContextHolder.publishEvent(new FlowableUpdateGroupEvent(map));
-        }
-      return ResultRespone.success(true);
-    }
-
-    /**
-     * 通过id删除系统码表
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除系统码表" )
-    @ApiOperation(value = "通过ID删除系统码表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-      return ResultRespone.success(codeService.removeById(id));
-    }
-
-
-    /**
-     * 通过id删除系统码表
-     * @param ids id数组
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除系统码表" )
-    @ApiOperation(value = "通过ID删除系统码表")
-    @DeleteMapping("/removeByIds" )
-    public ResultRespone removeByIds(@ApiParam(value = "通过ID拼接的字符串,以逗号隔开.如,'1,2,3,4,5,6,7",name = "ids",required = true) String ids,
-                                     @ApiParam(value = "对应级别",name = "ulevel",required = true) String ulevel) {
-        if(StringUtil.isEmpty(ulevel)){
-            return ResultRespone.failed("字典级别不能为空");
-        }
-
-        String[] idss=ids.split(",");
-        List<Long> list=new ArrayList();
-        boolean flag=true;
-        StringBuffer sb=new StringBuffer(),values=new StringBuffer();
-        for(String id:idss){
-            //查询是否存在二级ID
-            Code code=codeService.getById(id);
-            if("1".equals(ulevel)){
-
-                List<Code> codeList=codeService.list(Wrappers.<Code>lambdaQuery()
-                .eq(Code::getUlevel,"2").eq(Code::getKey,code.getKey()));
-                if(codeList.size()>0){
-                    flag=false;
-                    sb.append("key:").append(code.getKey()).append(",对应二级目录还存在").append(codeList.size())
-                            .append("条数据;");
-                }
-
-
-            }
-            //判断是否推送flowable
-            if(CommonConstants.POSTIONKEY.equals(code.getKey())){
-                values.append(",").append(code.getValue());
-            }
-            list.add(Long.valueOf(id));
-        }
-        if(flag){
-            boolean b = codeService.removeByIds(list);
-            if(b && values.length()>0){
-                //推送到flowable
-//                SpringContextHolder.publishEvent(new FlowableDeleteGroupEvent(values.toString().substring(1)));
-            }
-            return ResultRespone.success();
-        }else {
-            return ResultRespone.failed("字典存在子集信息，不能删除："+sb.toString());
-        }
-
-    }
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/CommonController.java

@@ -1,52 +0,0 @@
-package com.tofly.base.controller;
-
-import com.tofly.base.service.CommonService;
-import com.tofly.common.core.constant.TableFkConstans;
-import com.tofly.common.core.entity.ResultRespone;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * @author tuonbed
- * @date 2019/11/11  16:12
- */
-@RequestMapping("/common")
-@RestController
-@Api(tags="公共处理")
-public class CommonController {
-
-    @Autowired
-    private CommonService commonService;
-
-    @GetMapping("/isExists" )
-    @ApiOperation(value = "判断字段是否存在")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "table", value = "表名（例如user）", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "columnValue", value = "列值（例如admin）", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "parentId", value = "父级ID，菜单判断时使用", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "sysId", value = "子系统ID，菜单判断时使用", required = false, dataType = "String")
-    })
-    public ResultRespone<Boolean> isExists(@RequestParam Map map){
-        Map pmap= TableFkConstans.tables.get(map.get("table"));
-//        pmap.put("columnValue",map.get("columnValue"));
-//        pmap.put("parentId",map.get("parentId"));
-//        pmap.put("sysId",map.get("sysId"));
-        pmap.putAll(map);
-        return ResultRespone.success(commonService.getExistsNum(pmap));
-    }
-//
-//    @GetMapping("/isExists/{path}" )
-//    @ApiOperation(value = "判断字段是否存在")
-//    public ResultRespone<Boolean> isExists(@PathVariable String path, String value){
-//
-//    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/CommonFtpController.java

@@ -1,257 +0,0 @@
-package com.tofly.base.controller;
-
-import cn.hutool.core.io.FileTypeUtil;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.ftp.config.FtpUtil;
-import com.tofly.common.core.util.StringUtil;
-import com.tofly.common.core.util.io.IOUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.net.ftp.FTPFile;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.net.URLEncoder;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @author Administrator
- * @date 2019/10/14  17:20
- */
-@RestController
-@RequestMapping("/file")
-@Api(tags="文件FTP相关操作")
-@Slf4j
-public class CommonFtpController {
-
-    /**
-     * 返回图片
-     * @param response
-     * @return
-     */
-    @GetMapping(value = "/loadImg")
-    @ApiOperation(value = "根据FTP文件地址获取图片")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "remotePath", value = "图片地址", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "access_token", value = "token信息", required = true, dataType = "String")
-    })
-    public byte[] loadFileImg(@RequestParam(value = "remotePath")String remotePath, @RequestParam(value = "access_token")String access_token, HttpServletResponse response){
-        //String filename="/xnkd/demo/pic/QQ图片20191014133817.png";
-        String fileType=remotePath.substring(remotePath.lastIndexOf("."));
-        if (StringUtil.isNotEmpty(fileType)) {
-            fileType = fileType.toLowerCase();
-        }
-        switch (fileType) {
-            case ".jpg":
-            case ".jpeg":
-                response.setContentType(MediaType.IMAGE_JPEG_VALUE);
-                break;
-            case ".png":
-                response.setContentType(MediaType.IMAGE_PNG_VALUE);
-                break;
-            case ".gif":
-                response.setContentType(MediaType.IMAGE_GIF_VALUE);
-                break;
-            default:
-                response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
-                break;
-        }
-        byte[] b= FtpUtil.getByteDataforFile(remotePath);
-        return b;
-    }
-
-    /**
-     * 音频流
-     */
-    @SneakyThrows
-    @GetMapping(value = "/loadAudio")
-    @ApiOperation(value = "根据FTP文件地址获取音频")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "remotePath", value = "音频文件地址", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "access_token", value = "token信息", required = true, dataType = "String")
-
-    })
-    public void wavStream(String remotePath,String access_token,HttpServletRequest request, HttpServletResponse response) {
-        //String remotePath = "/xnkd/demo/pic/海阔天空.mp3";
-
-        File music = null;
-        music = File.createTempFile("tmp", remotePath.substring(remotePath.lastIndexOf(".")));
-
-        OutputStream ops = new FileOutputStream(music);
-        Boolean isSucccess = FtpUtil.retrieveFile(remotePath, ops);
-        log.info("=====写入临时文件成功与否：====" + isSucccess);
-
-        if (!music.exists()) {
-            log.info("不存在 文件名为：" + remotePath + "的音频文件！");
-        }
-
-        String range = request.getHeader("Range");
-        //开始下载位置
-        long startByte = 0;
-        //结束下载位置
-        long endByte = music.length() - 1;
-        //有range的话
-        if (range != null && range.contains("bytes=") && range.contains("-")) {
-            range = range.substring(range.lastIndexOf("=") + 1).trim();
-            String ranges[] = range.split("-");
-            try {
-                //判断range的类型
-                if (ranges.length == 1) {
-                    //类型一：bytes=-2343
-                    if (range.startsWith("-")) {
-                        endByte = Long.parseLong(ranges[0]);
-                    }
-                    //类型二：bytes=2343-
-                    else if (range.endsWith("-")) {
-                        startByte = Long.parseLong(ranges[0]);
-                    }
-                }
-                //类型三：bytes=22-2343
-                else if (ranges.length == 2) {
-                    startByte = Long.parseLong(ranges[0]);
-                    endByte = Long.parseLong(ranges[1]);
-                }
-            } catch (NumberFormatException e) {
-                startByte = 0;
-                endByte = music.length() - 1;
-            }
-        }
-        //要下载的长度
-        long contentLength = endByte - startByte + 1;
-        //文件名
-        String fileName = music.getName();
-        //文件类型
-        String contentType = FileTypeUtil.getType(music);
-
-        //各种响应头设置
-        //参考资料：https://www.ibm.com/developerworks/cn/java/joy-down/index.html
-        //坑爹地方一：看代码
-        response.setHeader("Accept-Ranges", "bytes");
-        //坑爹地方二：http状态码要为206
-        response.setStatus(206);
-        response.setContentType(contentType);
-        response.setHeader("Content-Type", contentType);
-        //这里文件名换你想要的，inline表示浏览器直接实用（我方便测试用的）
-        //参考资料：http://hw1287789687.iteye.com/blog/2188500
-        // response.setHeader("Content-Disposition", "inline;filename=test.mp3");
-        response.setHeader("Content-Length", String.valueOf(contentLength));
-        //坑爹地方三：Content-Range，格式为
-        // [要下载的开始位置]-[结束位置]/[文件总大小]
-        response.setHeader("Content-Range", "bytes " + startByte + "-" + endByte + "/" + music.length());
-        BufferedOutputStream outputStream = null;
-        RandomAccessFile randomAccessFile = null;
-        //已传送数据大小
-        long transmitted = 0;
-        try {
-            randomAccessFile = new RandomAccessFile(music, "r");
-            outputStream = new BufferedOutputStream(response.getOutputStream());
-            byte[] buff = new byte[2048];
-            int len = 0;
-            randomAccessFile.seek(startByte);
-            //坑爹地方四：判断是否到了最后不足4096（buff的length）个byte这个逻辑（(transmitted + len) <= contentLength）要放前面！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！！
-            //不然会会先读取randomAccessFile，造成后面读取位置出错，找了一天才发现问题所在
-            while ((transmitted + len) <= contentLength && (len = randomAccessFile.read(buff)) != -1) {
-                outputStream.write(buff, 0, len);
-                transmitted += len;
-                //停一下，方便测试，用的时候删了就行了
-            }
-            //处理不足buff.length部分
-            if (transmitted < contentLength) {
-                len = randomAccessFile.read(buff, 0, (int) (contentLength - transmitted));
-                outputStream.write(buff, 0, len);
-                transmitted += len;
-            }
-            outputStream.flush();
-            response.flushBuffer();
-            randomAccessFile.close();
-            log.info("下载完毕：" + startByte + "-" + endByte + "：" + transmitted);
-        } finally {
-            try {
-                if (randomAccessFile != null) {
-                    randomAccessFile.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-
-    /**
-     * 返回图片
-     * @param response
-     * @return
-     */
-    @GetMapping(value = "/downloadFile")
-    @ApiOperation(value = "根据FTP文件地址下载文件")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "remotePath", value = "文件地址", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "fileName", value = "文件名称", required = true, dataType = "String")
-    })
-    @SneakyThrows
-    public void downloadFile(String remotePath,String fileName,  HttpServletResponse response,HttpServletRequest request){
-        byte[] data = FtpUtil.getByteDataforFile(remotePath);
-        response.reset();
-        response.setCharacterEncoding("UTF-8");
-        String userAgent = request.getHeader("User-Agent");
-        String formFileName;
-        if (userAgent.contains("MSIE") || userAgent.contains("Trident")) {
-            // 针对IE或者以IE为内核的浏览器：
-            formFileName = URLEncoder.encode(fileName, "UTF-8");
-        } else {
-            // 非IE浏览器的处理：
-            formFileName = new String(fileName.getBytes("UTF-8"), "ISO-8859-1");
-        }
-        response.setHeader("Content-Disposition", String.format("attachment; filename=%s",formFileName));
-        response.addHeader("Content-Length", "" + data.length);
-        response.setContentType("application/octet-stream; charset=UTF-8");
-        response.setHeader("content-type", "application/octet-stream");
-        try{
-            IOUtil.write(response.getOutputStream(), Boolean.TRUE, data);
-        }catch (IOException e){
-            log.error(e.getMessage());
-            e.getMessage();
-        }
-    }
-
-    @GetMapping(value = "/getFileList")
-    @ApiOperation(value = "根据FTP文件目录查询文件信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "remotePath", value = "文件目录", required = true, dataType = "String")
-    })
-    @SneakyThrows
-    public ResultRespone getFileList(String remotePath){
-        FTPFile[] ftpFiles = FtpUtil.retrieveFTPFiles(remotePath);
-        if(ftpFiles==null || ftpFiles.length==0){
-            return ResultRespone.failed("该目录未获取到ftp文件");
-        }
-        final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        final DecimalFormat df = new DecimalFormat("0.00");//格式化小数
-        List<Map> collect = Arrays.stream(ftpFiles).map(f -> {
-            Map map = new HashMap();
-            map.put("fileName", f.getName());
-            map.put("size", df.format((double)f.getSize()/1024/1024)+"M");
-
-            String dateStr = sdf.format(f.getTimestamp().getTime());
-            map.put("createTime", dateStr);
-            return map;
-        }).collect(Collectors.toList());
-        return ResultRespone.success(collect);
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/ConfigController.java

@@ -1,100 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import com.tofly.base.entity.Config;
-import com.tofly.base.service.ConfigService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import org.springframework.web.bind.annotation.ModelAttribute;
-
-/**
- * 系统配置信息表
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/config")
-@Api(tags="系统参数管理")
-public class ConfigController {
-
-    private final  ConfigService configService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param config 系统配置信息表
-    * @return
-    */
-    @GetMapping("/page" )
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getConfigPage(Page page, @ModelAttribute Config config) {
-      return ResultRespone.success(configService.page(page, Wrappers.query(config)));
-    }
-
-
-    /**
-     * 通过id查询系统配置信息表
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(configService.getById(id));
-    }
-
-//    /**
-//     * 新增系统配置信息表
-//     * @param config 系统配置信息表
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title="新增系统配置信息表" )
-//    @ApiOperation(value = "新增系统配置信息表")
-//    @PostMapping
-//    public ResultRespone save(@RequestBody Config config) {
-//      return ResultRespone.success(configService.save(config));
-//    }
-
-    /**
-     * 修改系统配置信息表
-     * @param config 系统配置信息表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改系统配置信息表" )
-    @ApiOperation(value = "修改系统配置信息表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody Config config) {
-      return ResultRespone.success(configService.updateById(config));
-    }
-
-//    /**
-//     * 通过id删除系统配置信息表
-//     * @param id id
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title="通过id删除系统配置信息表" )
-//    @ApiOperation(value = "通过ID删除系统配置信息表")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-//    })
-//    @DeleteMapping("/{id}" )
-//    public ResultRespone removeById(@PathVariable Long id) {
-//      return ResultRespone.success(configService.removeById(id));
-//    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/ConnectionController.java

@@ -1,98 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.entity.Connection;
-import com.tofly.base.service.ConnectionService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 空间库连接配置信息表
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/connection")
-@Api(tags="空间库连接配置信息表接口")
-public class ConnectionController {
-
-    private final  ConnectionService connectionService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param connection 空间库连接配置信息表
-    * @return
-    */
-    @GetMapping("/page" )
-    //@ApiOperation(value = "分页查询")
-    public ResultRespone getConnectionPage(Page page, @ModelAttribute Connection connection) {
-      return ResultRespone.success(connectionService.page(page, Wrappers.query(connection)));
-    }
-
-
-    /**
-     * 通过id查询空间库连接配置信息表
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    //@ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(connectionService.getById(id));
-    }
-
-    /**
-     * 新增空间库连接配置信息表
-     * @param connection 空间库连接配置信息表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增空间库连接配置信息表" )
-    //@ApiOperation(value = "新增空间库连接配置信息表")
-    @PostMapping
-    public ResultRespone save(@RequestBody Connection connection) {
-      return ResultRespone.success(connectionService.save(connection));
-    }
-
-    /**
-     * 修改空间库连接配置信息表
-     * @param connection 空间库连接配置信息表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改空间库连接配置信息表" )
-    //@ApiOperation(value = "修改空间库连接配置信息表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody Connection connection) {
-      return ResultRespone.success(connectionService.updateById(connection));
-    }
-
-    /**
-     * 通过id删除空间库连接配置信息表
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除空间库连接配置信息表" )
-    //@ApiOperation(value = "通过ID删除空间库连接配置信息表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-      return ResultRespone.success(connectionService.removeById(id));
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/DepartmentController.java

@@ -1,300 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.entity.Department;
-import com.tofly.base.service.DepartmentService;
-import com.tofly.base.service.UserService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import com.tofly.base.entity.User;
-import io.swagger.annotations.*;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.util.*;
-
-import static com.baomidou.mybatisplus.core.toolkit.Wrappers.update;
-
-/**
- * 部门表
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@RequestMapping("/department")
-@Api(tags = "部门管理")
-@Slf4j
-public class DepartmentController {
-
-    @Value("${xrty.ftp.excelmb}")
-    private String filePathExcel;
-    @Autowired
-    private  DepartmentService departmentService;
-    @Autowired
-    private  UserService userService;
-
-    public DepartmentController() {
-    }
-
-    /**
-     * 分页查询
-     *
-     * @param page       分页对象
-     * @param department 部门表
-     * @return
-     */
-    @GetMapping("/page")
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getDepartmentPage(Page page, @ModelAttribute Department department) {
-        return ResultRespone.success(departmentService.page(page, Wrappers.query(department)));
-    }
-
-    /**
-     * 部门列表
-     *
-     * @param department 部门表
-     * @return
-     */
-    @GetMapping("/list")
-    @ApiOperation(tags = {"用户管理", "部门管理"}, value = "部门列表")
-    public ResultRespone getDepartmentList(@ModelAttribute Department department) {
-        return ResultRespone.success(departmentService.list(Wrappers.query(department)).stream().sorted(Comparator.comparing(Department::getUpdateTime, Comparator.reverseOrder()).thenComparing(Department::getId, Comparator.reverseOrder())));
-    }
-
-
-    /**
-     * 部门列表
-     *
-     * @return
-     */
-    @GetMapping("/listAll")
-    @ApiOperation(tags = {"部门管理"}, value = "部门列表")
-    public ResultRespone departmentListAll() {
-        return ResultRespone.success(departmentService.list());    }
-
-    /**
-     * 通过id查询部门表
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}")
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id") Long id) {
-        return ResultRespone.success(departmentService.getById(id));
-    }
-
-    /**
-     * 新增部门表
-     *
-     * @param department 部门表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "新增部门表")
-    @ApiOperation(value = "新增部门表")
-    @PostMapping
-    public ResultRespone save(@RequestBody Department department) {
-        //先判断新增得部门名称是否重复
-        Department b = departmentService.getOne(Wrappers.<Department>lambdaQuery()
-                .eq(Department::getName,department.getName())
-                .eq(Department::getStatusFlag,"1"));
-        if (null!=b){
-            return ResultRespone.failed("新增的部门名称已存在");
-        }
-        Department a = departmentService.getOne(Wrappers.<Department>lambdaQuery()
-                .eq(Department::getName,department.getName())
-                .eq(Department::getStatusFlag,"0"));
-        if (null!=a){
-            department.setId(a.getId());
-            department.setStatusFlag("1");
-            return ResultRespone.success(departmentService.updateById(department));
-        }
-        return ResultRespone.success(departmentService.save(department));
-    }
-
-    /**
-     * 修改部门表
-     *
-     * @param department 部门表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "修改部门表")
-    @ApiOperation(value = "修改部门表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody Department department) {
-        //先判断新增得部门名称是否重复
-        Department b = departmentService.getOne(Wrappers.<Department>lambdaQuery().eq(Department::getName,department.getName()));
-        if (null!=b){
-            return ResultRespone.failed("你修改的部门名称已存在");
-        }
-        return ResultRespone.success(departmentService.updateById(department));
-    }
-
-    /**
-     * 通过id删除部门表
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "通过id删除部门表")
-    @ApiOperation(value = "通过ID删除部门表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}")
-    public ResultRespone removeById(@PathVariable Long id) {
-        //非传统意义删除，修改禁用标志
-        Department department = new Department();
-        department.setId(id);
-        department.setStatusFlag("0");
-
-        return ResultRespone.success(update(department));
-    }
-
-    /**
-     * 通过id删除单位
-     *
-     * @param ids id数组
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "通过id删除单位")
-    @ApiOperation(value = "通过ID删除单位")
-    @DeleteMapping("/removeByIds")
-    public ResultRespone removeByIds(@ApiParam(value = "通过ID拼接的字符串,以逗号隔开.如,'1,2,3,4,5,6,7", name = "ids", required = true) String ids) {
-        String[] idss = ids.split(",");
-        List<Long> list = new ArrayList();
-        boolean flag = true;
-        StringBuffer sb = new StringBuffer();
-        for (String id : idss) {
-            //查询是否存在子级部门
-            List<Department> departmentList = departmentService.list(Wrappers.<Department>lambdaQuery()
-                    .eq(Department::getParentId, Long.valueOf(id)));
-
-            if (departmentList.size() > 0) {
-                flag = false;
-                sb.append("id:").append(id).append(",对应子级单位还存在").append(departmentList.size())
-                        .append("条数据;");
-                break;
-
-            }
-
-            List<User> userList = userService.list(Wrappers.<User>lambdaQuery()
-                    .eq(User::getDepartmentId,Long.valueOf(id)));
-            if (userList.size() > 0) {
-                flag = false;
-                sb.append("id:").append(id).append(",对应用户还存在数据");
-//                        .append(departmentList.size())
-//                        .append("条数据;");
-                break;
-
-            }
-            list.add(Long.valueOf(id));
-        }
-        if (flag) {
-            return ResultRespone.success(departmentService.removeByIds(list));
-        } else {
-            return ResultRespone.failed("不能删除：" + sb.toString());
-        }
-    }
-
-    /**
-     * 通过单位ID查询资源列表
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/listSourceById")
-    @ApiOperation(value = "通过单位ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone listSourceById(Long id) {
-        List list = departmentService.listSourceByDept(id);
-        list.sort((Comparator<Map>) (o1, o2) -> {
-            Date date1 = (Date) o1.get("createTime");
-            Date date2 = (Date) o2.get("createTime");
-            if (date1.equals(date2)) {
-                String id1 = (String) o1.get("id");
-                String id2 = (String) o2.get("id");
-                return id2.compareTo(id1);
-            }
-            //将date1与date2位置调换则变为升序
-            return date2.compareTo(date1);
-        });
-        return ResultRespone.success(list);
-    }
-
-
-    /**
-     * 分页查询
-     *
-     * @return
-     */
-    @GetMapping("/subList")
-    @ApiOperation(value = "查询部门所有下属部门")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long"),
-            @ApiImplicitParam(name = "returnSelf", value = "是否包括自己", required = false, dataType = "String")
-    })
-    public ResultRespone getDepartmentPage(@RequestParam("id") Long id, @RequestParam(name = "returnSelf", required = false) String returnSelf) {
-
-        return ResultRespone.success(departmentService.subList(id, returnSelf));
-    }
-
-    /**
-     * 批量导入部门信息
-     *
-     * @return
-     */
-    @ToFlyAppLog(title = "通过文件批量导入部门信息")
-    @ApiOperation(value = "通过文件批量导入部门信息")
-    @PostMapping("/batchDepartment")
-    public ResultRespone uploadBatchMenu(MultipartFile file) throws Exception {
-        return ResultRespone.success(departmentService.uploadBatchDepartment(file));
-    }
-
-
-    /**
-     * 部门信息模板下载
-     *
-     * @return
-     */
-
-    @GetMapping(value = "/template")
-    @ApiOperation(value = "部门信息模版下载", notes = "部门信息模版下载")
-    public void planTemplate(HttpServletResponse response) throws Exception {
-        downloadExcel(response, "部门信息模版.xlsx", "部门信息模版.xlsx");
-    }
-
-    public void downloadExcel(HttpServletResponse response, String path, String fileName) throws Exception {
-        // 将文件名称进行编码
-        response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
-        response.setContentType("application/octet-stream");
-        // 读取服务器端模板文件
-        try (InputStream inputStream = DepartmentController.class.getResourceAsStream(path);
-             OutputStream outputStream = response.getOutputStream()) {
-            byte[] buffer = new byte[1024];
-            int len;
-            while ((len = inputStream.read(buffer)) != -1) {
-                outputStream.write(buffer, 0, len);
-            }
-            outputStream.flush();
-        }
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/DepartmentsourceController.java

@@ -1,154 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sun.xml.bind.v2.model.core.ID;
-import com.tofly.base.dto.DepartmentSouceDTO;
-import com.tofly.base.entity.Departmentsource;
-import com.tofly.base.service.DepartmentsourceService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import io.swagger.annotations.*;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Comparator;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 单位资源配置关联信息表
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/departmentsource")
-@Api(tags = "单位资源配置关联信息表接口")
-public class DepartmentsourceController {
-
-    private final DepartmentsourceService departmentsourceService;
-
-    /**
-     * 分页查询
-     *
-     * @param page             分页对象
-     * @param departmentsource 单位资源配置关联信息表
-     * @return
-     */
-    @GetMapping("/page")
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getDepartmentsourcePage(Page page, @ModelAttribute Departmentsource departmentsource) {
-        return ResultRespone.success(departmentsourceService.page(page, Wrappers.query(departmentsource)));
-    }
-
-
-    /**
-     * 资源列表
-     *
-     * @param departmentsource 单位资源配置关联信息表
-     * @return
-     */
-    @GetMapping("/list")
-    @ApiOperation(tags = {"部门管理"}, value = "单位资源列表")
-    public ResultRespone getDepartmentsourcePage(@ModelAttribute Departmentsource departmentsource) {
-        return ResultRespone.success(departmentsourceService.list(Wrappers.query(departmentsource)).stream().sorted(Comparator.comparing(Departmentsource::getCreateTime, Comparator.reverseOrder()).thenComparing(Departmentsource::getId, Comparator.reverseOrder())));
-    }
-
-    /**
-     * 通过id查询单位资源配置关联信息表
-     *
-     * @param departmentId id
-     * @return ResultRespone
-     */
-    @GetMapping("/{departmentId}")
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "departmentId", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("departmentId") Long departmentId) {
-        return ResultRespone.success(departmentsourceService.selectByDepartMent(departmentId));
-    }
-
-    /**
-     * 新增单位资源配置关联信息表
-     *
-     * @param departmentsource 单位资源配置关联信息表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "新增单位资源配置关联信息表")
-    @ApiOperation(value = "新增单位资源配置关联信息表")
-    @PostMapping
-    public ResultRespone save(@RequestBody Departmentsource departmentsource) {
-        return ResultRespone.success(departmentsourceService.save(departmentsource));
-    }
-
-//    /**
-//     * 修改单位资源配置关联信息表
-//     * @param departmentsource 单位资源配置关联信息表
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title="修改单位资源配置关联信息表" )
-//    @ApiOperation(value = "修改单位资源配置关联信息表")
-//    @PutMapping
-//    public ResultRespone updateById(@RequestBody Departmentsource departmentsource) {
-//      return ResultRespone.success(departmentsourceService.updateById(departmentsource));
-//    }
-
-    /**
-     * 通过id删除单位资源配置关联信息表
-     *
-     * @param departmentId id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "通过id删除单位资源配置关联信息表")
-    @ApiOperation(value = "通过ID删除单位资源配置关联信息表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "departmentId", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{departmentId}")
-    public ResultRespone removeById(@PathVariable Long departmentId) {
-        return ResultRespone.success(departmentsourceService.removeById(departmentId));
-    }
-
-
-    /**
-     * 修改单位资源配置关联信息表
-     *
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "修改单位资源配置关联信息表")
-    @ApiOperation(tags = {"部门管理"}, value = "修改单位资源配置关联信息表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "departmentId", value = "部门ID", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "sourceIds", value = "资源ID，多个使用逗号(,)隔开", dataType = "String")
-    })
-    @PutMapping
-    public ResultRespone updateById(@ApiParam(hidden = true) @RequestBody Map map) {
-        return ResultRespone.success(
-                departmentsourceService.updateDepartmentsource(Long.valueOf((String) (map.get("departmentId"))), (String) map.get("sourceIds")));
-    }
-
-    /**
-     * 地图数据服务挂接
-     *
-     * @return
-     */
-    @ToFlyAppLog(title = "地图数据服务挂接")
-    @ApiOperation(value = "地图数据服务挂接")
-    @PostMapping("departmentConnectionSource")
-    public ResultRespone departmentConnectionSource(@RequestBody DepartmentSouceDTO departmentSouceDTO) {
-        Departmentsource departmentsource = new Departmentsource();
-        departmentsource.setSourceId(departmentSouceDTO.getSourceId());
-        departmentsource.setDepartmentId(departmentSouceDTO.getDepartmentId());
-        departmentsource.setUserId(departmentSouceDTO.getUserId());
-        departmentsource.setCreateTime(new Date());
-        return ResultRespone.success(departmentsourceService.save(departmentsource));
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/ExcelDisposeInfoController.java

@@ -1,94 +0,0 @@
-package com.tofly.base.controller;
-
-import com.google.common.collect.Lists;
-
-import com.tofly.base.em.Constant;
-import com.tofly.base.em.ExcelExportFileTypeEnum;
-import com.tofly.base.em.ExcelImportFileTypeEnum;
-import com.tofly.base.strategy.ExcelStrategyContext;
-import com.tofly.base.util.ExcelUtil;
-import com.tofly.common.core.constant.ResponeStatus;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.oauth.exception.ToflyDeniedException;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * Excel处理信息接口 前端控制器
- * </p>
- *
- * @author Zev
- * @since 2021-01-19
- */
-@RestController
-@RequestMapping("/excel-dispose-info")
-@Api(tags = "Excel处理信息接口")
-@Slf4j
-public class ExcelDisposeInfoController {
-
-    @Autowired
-    private ExcelStrategyContext excelStrategyContext;
-
-    @ApiOperation(value = "导出excel数据")
-    @GetMapping("/exportData")
-    public void exportData(HttpServletResponse response, String templateServiceType, String templateFlag, String dto) {
-
-        // 根据templateServiceType,templateFlag获取对应模板数据
-        ExcelExportFileTypeEnum excelExportFileTypeEnum = ExcelExportFileTypeEnum.getExcelExportFileTypeEnum(templateServiceType, templateFlag);
-        if(null == excelExportFileTypeEnum){
-            return;
-        }
-        // 从模型类型枚举根据templateServiceType获取策略对应模板数据
-        List<Map<String, Object>> dataList = excelStrategyContext.getExportData(templateServiceType, templateFlag,dto);
-        ExcelUtil.export(dataList.get(0), excelExportFileTypeEnum, Constant.FILE_PATH_TEST_EXPORT_EXCEL, response);
-    }
-
-    @ApiOperation(value = "导入excel数据")
-    @PostMapping("/importData")
-    public ResultRespone<Object> importData(@RequestParam(value = "file", required = false) MultipartFile file, String templateServiceType) {
-        ResultRespone<Object> rest = new ResultRespone<>();
-        // 根据templateServiceType获取对应模板数据
-        ExcelImportFileTypeEnum excelImportFileTypeEnum = ExcelImportFileTypeEnum.getExcelImportFileTypeEnum(templateServiceType);
-        if(null == excelImportFileTypeEnum ){
-            return ResultRespone.failed("获取对应模板数据为空");
-        }
-        try {
-            List<Object> dataList = Lists.newArrayList();
-            ExcelUtil.read(dataList,excelImportFileTypeEnum, file, true);
-            // 数据落库
-            excelStrategyContext.excelDataStorage(templateServiceType,dataList);
-        } catch (ToflyDeniedException e) {
-            log.error("插入数据异常:e = {}", e.getMessage());
-            rest.setCode(ResponeStatus.FAIL.getCode());
-            rest.setMessage(e.getMessage());
-        }
-        return rest;
-    }
-
-//    @ApiOperation(value = "本地测试导入excel数据")
-//    @GetMapping("/testImportData")
-//    public String testImportData(@RequestParam(value = "file", required = false) MultipartFile file) {
-//        List<Object> userInfoList = Lists.newArrayList();
-//        try {
-//            // 本地File文件转MultipartFile作临时测试前端上传文件导入数据
-//            File fileLocal = FileUtil.newFile(Constants.FILE_PATH_TEST_EXPORT_EXCEL);
-//            InputStream inputStream = new FileInputStream(fileLocal);
-//            MultipartFile multipartFile = new MockMultipartFile(fileLocal.getName(), inputStream);
-//            ExcelUtil.read(userInfoList, ExcelImportFileTypeEnum.IMPORT_RIVER_BASE_INFO_XML, multipartFile, true);
-//            System.out.println(JSON.toJSONString(userInfoList));
-//            System.out.println(userInfoList.size());
-//        } catch (Exception e) {
-//            return e.getMessage();
-//        }
-//        return "SUCCESS";
-//    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/FtpfilesController.java

@@ -1,137 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.tofly.base.entity.Ftpfiles;
-import com.tofly.base.service.FtpfilesService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.core.util.io.IOUtil;
-import com.tofly.common.oauth.auth.innerCall;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import lombok.SneakyThrows;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.net.URLEncoder;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 公共基础附件信息表
- *
- * @author wangjian
- * @date Mon Feb 17 00:00:00 CST 2020
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/ftpfiles")
-//@Api(tags="公共基础附件信息表接口")
-public class FtpfilesController {
-
-    private final  FtpfilesService ftpfilesService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param ftpfiles 公共基础附件信息表
-    * @return
-    */
-//    @GetMapping("/page" )
-//    @ApiOperation(value = "分页查询")
-//    public ResultRespone getFtpfilesPage(Page page, @ModelAttribute Ftpfiles ftpfiles) {
-//      return ResultRespone.success(ftpfilesService.page(page, Wrappers.query(ftpfiles)));
-//    }
-//
-//
-//    /**
-//     * 通过id查询公共基础附件信息表
-//     * @param id id
-//     * @return ResultRespone
-//     */
-//    @GetMapping("/{id}" )
-//    @ApiOperation(value = "通过ID查询")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-//    })
-//    public ResultRespone getById(@PathVariable("id" ) Long id) {
-//      return ResultRespone.success(ftpfilesService.getById(id));
-//    }
-//
-//    /**
-//     * 新增公共基础附件信息表
-//     * @param ftpfiles 公共基础附件信息表
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title="新增公共基础附件信息表" )
-//    @ApiOperation(value = "新增公共基础附件信息表")
-//    @PostMapping
-//    public ResultRespone save(@RequestBody Ftpfiles ftpfiles) {
-//      return ResultRespone.success(ftpfilesService.save(ftpfiles));
-//    }
-//
-//    /**
-//     * 修改公共基础附件信息表
-//     * @param ftpfiles 公共基础附件信息表
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title="修改公共基础附件信息表" )
-//    @ApiOperation(value = "修改公共基础附件信息表")
-//    @PutMapping
-//    public ResultRespone updateById(@RequestBody Ftpfiles ftpfiles) {
-//      return ResultRespone.success(ftpfilesService.updateById(ftpfiles));
-//    }
-//
-//    /**
-//     * 通过id删除公共基础附件信息表
-//     * @param id id
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title="通过id删除公共基础附件信息表" )
-//    @ApiOperation(value = "通过ID删除公共基础附件信息表")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-//    })
-//    @DeleteMapping("/{id}" )
-//    public ResultRespone removeById(@PathVariable Long id) {
-//      return ResultRespone.success(ftpfilesService.removeById(id));
-//    }
-
-    @innerCall
-    @PostMapping("/saveBatch")
-    public ResultRespone saveBatch(@RequestBody List<Ftpfiles> listFtpFiles){
-        return ResultRespone.success(ftpfilesService.customSaveBatch(listFtpFiles));
-    }
-
-    @GetMapping("/queryFiles")
-    @ApiOperation(tags = {"文件FTP相关操作"},value = "通过ID批量查询公共附件信息")
-    public ResultRespone queryFiles(@ApiParam(value = "字符串型文件id，多个以;隔开", name = "ids",required = true) String ids){
-        List<Long> list=Arrays.stream(ids.split(";")).map(Long::parseLong).collect(Collectors.toList());
-        return ResultRespone.success(ftpfilesService.listByIds(list));
-    }
-
-    @GetMapping("/download")
-    @ApiOperation(tags = {"文件FTP相关操作"},value = "通过ID批量下载附件信息")
-    @SneakyThrows
-    public void download(@ApiParam(value = "字符串型文件id，多个以;隔开", name = "ids",required = true) String ids,
-                         HttpServletResponse response){
-        List<Long> list=Arrays.stream(ids.split(";")).map(Long::parseLong).collect(Collectors.toList());
-        Collection<Ftpfiles> ftpfiles = ftpfilesService.listByIds(list);
-        byte[] data =ftpfilesService.getDataFiles(ftpfiles);
-        Ftpfiles first = ftpfiles.stream().findFirst().get();
-        String fileName= first.getFilePath().split("/")[2];
-        response.reset();
-        response.setHeader("Content-Disposition", String.format("attachment; filename=%s.zip", URLEncoder.encode(fileName, "utf-8")));
-        response.addHeader("Content-Length", "" + data.length);
-        response.setContentType("application/octet-stream; charset=UTF-8");
-
-        IOUtil.write(response.getOutputStream(), Boolean.TRUE, data);
-
-    }
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/LogController.java

@@ -1,303 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.api.CodeClient;
-import com.tofly.base.em.Constant;
-import com.tofly.base.entity.Log;
-import com.tofly.base.entity.User;
-import com.tofly.base.service.LogService;
-import com.tofly.base.service.UserService;
-import com.tofly.base.util.DateTimeUtil;
-import com.tofly.base.vo.CountLogVo;
-import com.tofly.base.vo.OperationRecordsVo;
-import com.tofly.common.core.constant.CommonConstants;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.core.util.StringUtil;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import com.tofly.common.oauth.auth.innerCall;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 日志信息表
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@RequestMapping("/log")
-@Api(tags = "日志管理")
-@Slf4j
-public class LogController {
-    private static final Logger logs = org.slf4j.LoggerFactory.getLogger(LogController.class);
-
-    @Autowired
-    private LogService logService;
-    @Autowired
-    private CodeClient codeClient;
-
-    @Autowired
-    private UserService userService;
-//    @Autowired
-//    private BaseEsLogService baseEsLogService;
-
-    @Value("${isUseEs:false}")
-    private boolean isUseEs;
-
-    /**
-     * 分页查询
-     *
-     * @param page 分页对象
-     * @param log  日志信息表
-     * @return
-     */
-    @GetMapping("/page")
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getLogPage(Page page, @ModelAttribute Log log) {
-
-        return ResultRespone.success(logService.page(page, Wrappers.query(log)));
-    }
-
-    /**
-     * 分页查询
-     *
-     * @param page 分页对象
-     * @return
-     */
-    @GetMapping("/pageNew")
-    @ApiOperation(value = "分页查询-新")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "deptId", value = "部门id", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "userIds", value = "用户id多个以,分隔", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "type", value = "类型", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "startDate", value = "开始日期", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "endDate", value = "结束日期", required = false, dataType = "String")
-    })
-    @ToFlyAppLog(title = "通过分页查询日志信息")
-    public ResultRespone getLogPageNew(Page page, String deptId, String userIds, String type, String startDate, String endDate) {
-
-        System.out.println(isUseEs);
-        // 部门id不为空获取当前部门下所有用户登录名列表
-        Map map = new HashMap(12);
-
-        if (!StringUtils.isEmpty(deptId)) {
-            List<String> collect = userService.getDepartmentUsersByIds(Long.valueOf(deptId)).stream().map(User::getUsername).collect(Collectors.toList());
-                map.put("users",collect );
-
-        }
-        if (!StringUtils.isEmpty(userIds)) {
-            List<Long> ids = Arrays.stream(userIds.split(Constant.CSV)).map(s -> Long.parseLong(s.trim()))
-                    .collect(Collectors.toList());
-            List<String> collect = userService.list(new QueryWrapper<User>().lambda().in(User::getId, ids)).stream().map(User::getUsername).collect(Collectors.toList());
-            map.put("users",collect);
-        }
-        if (!StringUtils.isEmpty(type)) {
-            map.put("type", type);
-        }
-
-
-        map.put("startDate", StringUtil.isEmpty(startDate) ? null : startDate + " 00:00:00");
-        map.put("endDate", StringUtil.isEmpty(endDate) ? null : endDate + " 23:59:59");
-//        if(isUseEs){
-//            log.info("开启了es，日志查询从es");
-//            Log log=new Log();
-//            log.setType(type);
-////            Map map1=new HashMap();
-////            map1.put("page",page);
-////            map1.put("logMap",map);
-//            map.put("size",page.getSize());
-//            map.put("page",page.getCurrent());
-//            List list=baseEsLogService.queryLog(map);
-//            page.setRecords(list);
-//            return ResultRespone.success(page);
-//        }
-        return ResultRespone.success(logService.listLogPage(page, map));
-//        return ResultRespone.success(logService.page(page, Wrappers.<Log>lambdaQuery()
-//                .eq(!StringUtil.isEmpty(type),Log::getType, type)
-//                //.ge(!StringUtil.isEmpty(startDate),Log::getCreateTime, Timestamp.valueOf(startDate+" 00:00:00"))
-//                .ge(!StringUtil.isEmpty(startDate),Log::getCreateTime, !StringUtil.isEmpty(startDate)?DateUtil.getDateFormat(startDate):null)
-//                .le(!StringUtil.isEmpty(endDate),Log::getCreateTime, !StringUtil.isEmpty(endDate)?Timestamp.valueOf(endDate+" 23:59:59"):null)
-//        ));
-    }
-
-
-    /**
-     * 通过id查询日志信息表
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}")
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @ToFlyAppLog(title = "通过id查询日志信息表")
-    public ResultRespone getById(@PathVariable("id") Long id) {
-        return ResultRespone.success(logService.getById(id));
-    }
-
-    /**
-     * 新增日志信息表
-     *
-     * @param log 日志信息表
-     * @return ResultRespone
-     */
-    //@ToFlyAppLog(title="新增日志信息表"
-    //@ApiOperation(value = "新增日志信息表")
-    @innerCall
-    @PostMapping("/add")
-    public ResultRespone save(@RequestBody Log log) {
-//        if(isUseEs){
-//            System.out.println("开启了es，日志存储到es");
-//            return ResultRespone.success(baseEsLogService.saveLog(log));
-//        }
-        // 判断当前异常字段是否有值,若有值修改日志类型为0
-        if(!StringUtils.isEmpty(log.getException())){
-            log.setType(CommonConstants.LOG_EXCEPTION);
-        }
-        // 判断title是否为 content:注销登出 则修改日志类型为2
-        if("content:注销登出".equals(log.getTitle())){
-            log.setType(CommonConstants.LOG_LOGIN);
-        }
-        return ResultRespone.success(logService.save(log));
-    }
-
-    /**
-     * 新增日志信息表
-     *
-     * @param log 日志信息表
-     * @return ResultRespone
-     */
-    //@ToFlyAppLog(title="新增日志信息表"
-    //@ApiOperation(value = "新增日志信息表")
-    @PostMapping
-    public ResultRespone savethis(@RequestBody Log log) {
-
-        logService.save(log);
-
-        return ResultRespone.success(true);
-    }
-
-    /**
-     * 修改日志信息表
-     *
-     * @param log 日志信息表
-     * @return ResultRespone
-     */
-    //@ToFlyAppLog(title="修改日志信息表" )
-    //@ApiOperation(value = "修改日志信息表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody Log log) {
-        return ResultRespone.success(logService.updateById(log));
-    }
-
-    /**
-     * 通过id删除日志信息表
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    //@ToFlyAppLog(title="通过id删除日志信息表" )
-    //@ApiOperation(value = "通过ID删除日志信息表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}")
-    public ResultRespone removeById(@PathVariable Long id) {
-        return ResultRespone.success(logService.removeById(id));
-    }
-
-//    /**
-//     * 获取码表信息
-//     */
-//    @GetMapping("/getClock" )
-//    @ApiOperation(value = "获取码表得接口")
-//    public ResultRespone getClock(@RequestParam(value = "pCid") String pCid) {
-//        return ResultRespone.success(codeClient.updateCarInfo(pCid));
-//    }
-
-    /**
-     * 手动添加日志的相关类容
-     */
-    @PostMapping("/manuallyAdd")
-    @ApiOperation(value = "手动添加日志的相关类容")
-    public ResultRespone manuallyAdd(List<MultipartFile> fileList, HttpServletRequest request) {
-        return logService.manuallyAdd(fileList, request);
-    }
-
-
-    @GetMapping("/countLogType")
-    @ApiOperation(value = "获取日志统计分类(部门-类型-数量)")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "startDate", value = "开始日期", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "endDate", value = "结束日期", required = false, dataType = "String")
-    })
-    @ToFlyAppLog(title = "获取日志统计分类(部门-类型-数量)")
-    public ResultRespone<List<CountLogVo>> countLogType(String startDate, String endDate) {
-        Map map = new HashMap(12);
-        map.put("startDate", StringUtil.isEmpty(startDate) ? null : startDate + " 00:00:00");
-        map.put("endDate", StringUtil.isEmpty(endDate) ? null : endDate + " 23:59:59");
-        return ResultRespone.success(logService.countLogType(map));
-    }
-
-    @PutMapping("/updateUserOperationTime")
-    @ApiOperation(value = "更新用户操作时长")
-    public ResultRespone<Boolean> updateUserOperationTime(@RequestParam(value = "username") String username) {
-        Map map = new HashMap(12);
-        map.put("username",username);
-        List<Log> post = logService.list(new QueryWrapper<Log>().lambda().eq(Log::getCreateBy, username).eq(Log::getServiceId, "tofly-auth").eq(Log::getMethod, "POST").isNull(Log::getException).orderByDesc(Log::getCreateTime));
-
-        if(null!=post && post.size()>0){
-            Log oneLogInfo = post.get(0);
-            // 获取当前时间
-            Date createTime = oneLogInfo.getCreateTime();
-            LocalDateTime now = LocalDateTime.now();
-            LocalDateTime localDateTime = DateTimeUtil.fromLong2LocalDateTime(createTime.getTime());
-            Duration duration = Duration.between(localDateTime,now);
-            //相差的秒数
-            long seconds = duration.getSeconds();
-            oneLogInfo.setOperatingTime(BigDecimal.valueOf(seconds));
-
-            return ResultRespone.success(logService.updateById(oneLogInfo));
-        }
-
-
-        return ResultRespone.failed();
-    }
-
-    @GetMapping("/getOperationRecords")
-    @ApiOperation(value = "获取操作记录分类(部门-人员)")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "flag", value = "flag为空按照部门统计,flag为1按照部门人员统计", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "startTime", value = "统计操作起始时间 yyyy-MM-dd HH:mm:ss", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "endTime", value = "统计操作结束日期 yyyy-MM-dd HH:mm:ss", required = true, dataType = "String")
-    })
-    @ToFlyAppLog(title = "获取操作记录分类(部门-人员)")
-    public ResultRespone<List<OperationRecordsVo>> operationRecords(String flag,String startTime, String endTime) {
-        List<OperationRecordsVo> operationRecords = logService.getOperationRecords(flag, startTime, endTime);
-        return ResultRespone.success(operationRecords);
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/MenuController.java

@@ -1,226 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.entity.BaseSys;
-import com.tofly.base.entity.Menu;
-import com.tofly.base.entity.RoleMenu;
-import com.tofly.base.service.BaseSysService;
-import com.tofly.base.service.MenuService;
-import com.tofly.base.service.RoleMenuService;
-import com.tofly.base.vo.SystemMenuVO;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.core.util.StringUtil;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import io.swagger.annotations.*;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static com.baomidou.mybatisplus.core.toolkit.Wrappers.update;
-
-/**
- * 菜单表
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/menu")
-@Api(tags="菜单管理")
-public class MenuController {
-
-    private final  MenuService menuService;
-
-    private final RoleMenuService roleMenuService;
-
-    private final BaseSysService systemService;
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param menu 菜单表
-    * @return
-    */
-    @GetMapping("/page" )
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getMenuPage(Page page, @ModelAttribute Menu menu) {
-      return ResultRespone.success(menuService.page(page, Wrappers.query(menu)));
-    }
-
-    /**
-     * 菜单列表
-     * @param menu 菜单表
-     * @return
-     */
-    @GetMapping("/list" )
-    @ApiOperation(tags = {"用户管理","菜单管理","角色管理"},value = "菜单列表")
-    public ResultRespone getMenuPage(@ModelAttribute Menu menu) {
-        return ResultRespone.success(menuService.list(Wrappers.query(menu)));
-    }
-
-
-    /**
-     * 通过id查询菜单表
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(menuService.getById(id));
-    }
-
-    /**
-     * 新增菜单表
-     * @param menu 菜单表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增菜单表" )
-    @ApiOperation(value = "新增菜单表")
-    @PostMapping
-    public ResultRespone save(@RequestBody Menu menu) {
-      return ResultRespone.success(menuService.save(menu));
-    }
-
-    /**
-     * 修改菜单表
-     * @param menu 菜单表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改菜单表" )
-    @ApiOperation(value = "修改菜单表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody Menu menu) {
-      return ResultRespone.success(menuService.updateById(menu));
-    }
-
-    /**
-     * 通过id删除菜单表
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除菜单表" )
-    @ApiOperation(value = "通过ID删除菜单表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-        //非传统意义删除，修改禁用标志
-        Menu menu=new Menu();
-        menu.setId(id);
-        menu.setStatusFlag("0");
-
-        return ResultRespone.success(update(menu));
-        //return ResultRespone.success(menuService.removeById(id));
-    }
-
-    /**
-     * 通过id删除菜单
-     * @param ids id数组
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除菜单" )
-    @ApiOperation(value = "通过ID删除菜单")
-    @DeleteMapping("/removeByIds" )
-    public ResultRespone removeByIds(@ApiParam(value = "通过ID拼接的字符串,以逗号隔开.如,'1,2,3,4,5,6,7",name = "ids",required = true) String ids) {
-        String[] idss=ids.split(",");
-        List<Long> list=new ArrayList();
-        boolean flag=true;
-        StringBuffer sb=new StringBuffer();
-        for(String id:idss){
-
-            List<RoleMenu> roleMenuList = roleMenuService.list(Wrappers.<RoleMenu>lambdaQuery()
-                    .eq(RoleMenu::getMenuId, Long.valueOf(id)));
-            if(roleMenuList.size()>0){
-                flag=false;
-                sb.append("id:").append(id).append(",该菜单在角色里还存在").append(roleMenuList.size())
-                        .append("条数据;");
-            }
-
-            list.add(Long.valueOf(id));
-        }
-        if(flag){
-
-            //return ResultRespone.success(menuService.removeByIds(list));
-            String msg=menuService.removeMenuByIds(list);
-            return StringUtil.isEmpty(msg)?ResultRespone.success(true):
-                    ResultRespone.failed(msg);
-        }else {
-            return ResultRespone.failed("还存在角色正在使用该菜单，不能删除："+sb.toString());
-        }
-    }
-
-    @ToFlyAppLog(title="通过文件批量新增菜单" )
-    @ApiOperation(value = "通过文件批量新增菜单")
-    @PostMapping("/batchMenu" )
-    public ResultRespone uploadBatchMenu(MultipartFile file){
-        return ResultRespone.success(menuService.uploadBatchMenu(file));
-    }
-
-    /**
-     * 树形结构
-     *
-     * @param
-     * @return
-     */
-    @GetMapping("/getTreeMenu")
-    @ApiOperation(tags = { "树形菜单列表"}, value = "树形菜单列表")
-    public ResultRespone getTreeMenu() {
-        List<SystemMenuVO> vos = new ArrayList<>();
-        List<BaseSys> systems = systemService.list(Wrappers.<BaseSys>lambdaQuery().orderByAsc(BaseSys::getCreateTime));
-        List<Menu> list = menuService.queryAllMenu();
-        Map<Long,List<Menu>> menuList = list.stream().collect(Collectors.groupingBy(Menu::getSysId));
-        for (BaseSys s: systems){
-            SystemMenuVO systemMenuVO = new SystemMenuVO();
-            BeanUtils.copyProperties(s,systemMenuVO);
-            systemMenuVO.setLabel(s.getSysname());
-            systemMenuVO.setChildrens(menuList.get(s.getId()));
-            vos.add(systemMenuVO);
-        }
-        return ResultRespone.success(vos);
-    }
-
-    /**
-     * 通过用户动态的获取权限对应的菜单
-     *
-     * @param
-     * @return
-     */
-    @GetMapping("/getTreeMenuByUser")
-    @ApiOperation(tags = { "通过用户动态的获取权限对应的菜单"}, value = "通过用户动态的获取权限对应的菜单")
-    public ResultRespone getTreeMenuByUser(Long id) {
-        List<SystemMenuVO> vos = new ArrayList<>();
-        //获取系统菜单
-        List<BaseSys> systems = systemService.list(Wrappers.<BaseSys>lambdaQuery().orderByAsc(BaseSys::getCreateTime));
-        List<Menu> list = menuService.getTreeMenuByUser(id);
-//        List<Menu> list = menuService.getTreeMenuByUserNew(id);
-        Map<Long,List<Menu>> menuList = list.stream().collect(Collectors.groupingBy(Menu::getSysId));
-        for (BaseSys s: systems){
-                SystemMenuVO systemMenuVO = new SystemMenuVO();
-                BeanUtils.copyProperties(s, systemMenuVO);
-                systemMenuVO.setLabel(s.getSysname());
-            if (!CollectionUtils.isEmpty(menuList.get(s.getId()))){
-                systemMenuVO.setChildrens(menuList.get(s.getId()));
-                vos.add(systemMenuVO);
-            }
-        }
-        return ResultRespone.success(vos);
-    }
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/MsController.java

@@ -1,47 +0,0 @@
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.tofly.base.entity.Menu;
-import com.tofly.base.service.MenuService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.oauth.util.SecurityUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-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;
-
-/**
- * 移动端相关接口
- * @author tuonbed
- * @date 2020/3/26  9:05
- */
-@RestController
-@RequestMapping("/ms")
-@Api(tags="移动端接口")
-@Slf4j
-@AllArgsConstructor
-public class MsController {
-    private final MenuService menuService;
-
-    @ApiOperation(value = "获取用户移动端菜单信息")
-    @GetMapping("/getUserMenus")
-    public ResultRespone getUserMenu(){
-        List menuList= menuService.listMaps(Wrappers.<Menu>lambdaQuery()
-                .select(Menu::getId,Menu::getName,Menu::getParentId,Menu::getSort,Menu::getType,Menu::getIcon,Menu::getCode)
-                .orderByAsc(Menu::getSort)
-                .apply("exists\n" +
-                        " (select 1\n" +
-                        "          from TF_SMPN_USERROLE_X, TF_SMPN_ROLEMENU_X\n" +
-                        "         where TF_SMPN_USERROLE_X.role_id = TF_SMPN_ROLEMENU_X.role_id\n" +
-                        "           and TF_SMPN_ROLEMENU_X.menu_id = TF_SMPN_MENU_X.id\n" +
-                        "           and TF_SMPN_USERROLE_X.user_id = {0})", SecurityUtils.getUserId())
-                .apply("exists (select 1 from TF_SMPN_SYSTEM_X where TF_SMPN_SYSTEM_X.id=TF_SMPN_MENU_X.sys_id and code = 'ms' )")
-        );
-        return ResultRespone.success(menuList);
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/ParamconfigController.java

@@ -1,123 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import com.tofly.base.entity.Paramconfig;
-import com.tofly.base.service.ParamconfigService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import org.springframework.web.bind.annotation.ModelAttribute;
-
-import java.util.Arrays;
-
-/**
- * 参数配置信息表：TF_YWPN_PARAMCONFIG_W
- *
- * @author admin
- * @date Thu May 13 00:00:00 CST 2021
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/paramconfig")
-@Api(tags = "参数配置信息表接口")
-public class ParamconfigController {
-
-    private final ParamconfigService paramconfigService;
-
-    /**
-     * 分页查询
-     *
-     * @param page        分页对象
-     * @param paramconfig 参数配置信息表：TF_YWPN_PARAMCONFIG_W
-     * @return
-     */
-    @GetMapping("/page")
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getParamconfigPage(Page page, @ModelAttribute Paramconfig paramconfig) {
-        return ResultRespone.success(paramconfigService.page(page, Wrappers.query(paramconfig)));
-    }
-
-
-    /**
-     * 通过id查询参数配置信息表：TF_YWPN_PARAMCONFIG_W
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}")
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id") Long id) {
-        return ResultRespone.success(paramconfigService.getById(id));
-    }
-
-    /**
-     * 新增参数配置信息表：TF_YWPN_PARAMCONFIG_W
-     *
-     * @param paramconfig 参数配置信息表：TF_YWPN_PARAMCONFIG_W
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "新增参数配置信息表：TF_YWPN_PARAMCONFIG_W")
-    @ApiOperation(value = "新增参数配置信息表：TF_YWPN_PARAMCONFIG_W")
-    @PostMapping
-    public ResultRespone save(@RequestBody Paramconfig paramconfig) {
-        return ResultRespone.success(paramconfigService.save(paramconfig));
-    }
-
-    /**
-     * 修改参数配置信息表：TF_YWPN_PARAMCONFIG_W
-     *
-     * @param paramconfig 参数配置信息表：TF_YWPN_PARAMCONFIG_W
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "修改参数配置信息表：TF_YWPN_PARAMCONFIG_W")
-    @ApiOperation(value = "修改参数配置信息表：TF_YWPN_PARAMCONFIG_W")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody Paramconfig paramconfig) {
-        return ResultRespone.success(paramconfigService.updateById(paramconfig));
-    }
-
-    /**
-     * 通过id删除参数配置信息表：TF_YWPN_PARAMCONFIG_W
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "通过id删除参数配置信息表：TF_YWPN_PARAMCONFIG_W")
-    @ApiOperation(value = "通过ID删除参数配置信息表：TF_YWPN_PARAMCONFIG_W")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}")
-    public ResultRespone removeById(@PathVariable Long id) {
-        return ResultRespone.success(paramconfigService.removeById(id));
-    }
-
-    /**
-     * 通过id批量删除参数配置信息表：TF_YWPN_PARAMCONFIG_W
-     *
-     * @param ids id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "通过id批量删除参数配置信息表：TF_YWPN_PARAMCONFIG_W")
-    @ApiOperation(value = "通过ID批量删除参数配置信息表：TF_YWPN_PARAMCONFIG_W")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "批量删除，多个id以逗号隔开", required = true, dataType = "String")
-    })
-    @DeleteMapping("/deleteByIds")
-    public ResultRespone removeById(String ids) {
-        return ResultRespone.success(paramconfigService.removeByIds(Arrays.asList(ids.split(","))));
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/PortaluserController.java

@@ -1,98 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.entity.Portaluser;
-import com.tofly.base.service.PortaluserService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 地图资源用户表
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/portaluser")
-@Api(tags="地图资源用户表接口")
-public class PortaluserController {
-
-    private final  PortaluserService portaluserService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param portaluser 地图资源用户表
-    * @return
-    */
-    @GetMapping("/page" )
-    //@ApiOperation(value = "分页查询")
-    public ResultRespone getPortaluserPage(Page page, @ModelAttribute Portaluser portaluser) {
-      return ResultRespone.success(portaluserService.page(page, Wrappers.query(portaluser)));
-    }
-
-
-    /**
-     * 通过id查询地图资源用户表
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    //@ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(portaluserService.getById(id));
-    }
-
-    /**
-     * 新增地图资源用户表
-     * @param portaluser 地图资源用户表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增地图资源用户表" )
-    //@ApiOperation(value = "新增地图资源用户表")
-    @PostMapping
-    public ResultRespone save(@RequestBody Portaluser portaluser) {
-      return ResultRespone.success(portaluserService.save(portaluser));
-    }
-
-    /**
-     * 修改地图资源用户表
-     * @param portaluser 地图资源用户表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改地图资源用户表" )
-    //@ApiOperation(value = "修改地图资源用户表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody Portaluser portaluser) {
-      return ResultRespone.success(portaluserService.updateById(portaluser));
-    }
-
-    /**
-     * 通过id删除地图资源用户表
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除地图资源用户表" )
-    //@ApiOperation(value = "通过ID删除地图资源用户表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-      return ResultRespone.success(portaluserService.removeById(id));
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/PositionController.java

@@ -1,151 +0,0 @@
-///*
-// * Author: wangjian
-// * 生成controller
-// */
-//package com.tofly.base.controller;
-//
-//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-//import com.tofly.base.api.entity.MemberUser;
-//import com.tofly.base.entity.Position;
-//import com.tofly.base.service.PositionService;
-//import com.tofly.base.service.UserService;
-//import com.tofly.common.core.entity.ResultRespone;
-//import com.tofly.common.core.util.SpringContextHolder;
-//import com.tofly.common.log.annotation.ToFlyAppLog;
-//import com.tofly.common.oauth.feign.FlowableAddUserToGroupEvent;
-//import com.tofly.common.oauth.feign.FlowableDeleteUserToGroupEvent;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiImplicitParam;
-//import io.swagger.annotations.ApiImplicitParams;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.AllArgsConstructor;
-//import org.springframework.web.bind.annotation.*;
-//
-//import java.util.Map;
-//
-///**
-// * 职位表
-// *
-// * @author wangjian
-// * @date Tue Dec 03 00:00:00 CST 2019
-// */
-//@RestController
-//@AllArgsConstructor
-//@RequestMapping("/position")
-//@Api(tags="用户绑定职位")
-//public class PositionController {
-//
-//    private final PositionService positionService;
-//    private final UserService userService;
-//
-//    /**
-//    * 分页查询
-//    * @param page 分页对象
-//    * @return
-//    */
-//    @GetMapping("/page" )
-//    @ApiOperation(value = "分页查询")
-//    public ResultRespone getPositionPage(Page page,@RequestParam Map map) {
-//        page.setRecords(positionService.getPosition(map,page));
-//        return ResultRespone.success(page);
-//    }
-//
-//
-//    /**
-//     * 分页查询
-//     * @param page 分页对象
-//     * @return
-//     */
-//    @GetMapping("/pageAllUser" )
-//    @ApiOperation(value = "分页查询所有用户")
-//    public ResultRespone getAllUserPosition(Page page) {
-//        page.setRecords(positionService.getAllUserPosition(page));
-//        return ResultRespone.success(page);
-//    }
-//
-//
-//    /**
-//     * 通过id查询职位表
-//     * @param id id
-//     * @return ResultRespone
-//     */
-//    @GetMapping("/{id}" )
-//    @ApiOperation(value = "通过ID查询")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-//    })
-//    public ResultRespone getById(@PathVariable("id" ) Long id) {
-//      return ResultRespone.success(positionService.getById(id));
-//    }
-//
-//    /**
-//     * 新增职位表
-//     * @param position 职位表
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title="新增用户职位" )
-//    @ApiOperation(value = "新增用户职位")
-//    @PostMapping
-//    public ResultRespone save(@RequestBody Position position) {
-//        boolean save = positionService.save(position);
-//        if(save){
-//            MemberUser memberUser=new MemberUser();
-//            memberUser.setGroupId(position.getCategory());
-//            memberUser.setUser(userService.getById(position.getUserId()));
-//            //调用工作流接口
-//            SpringContextHolder.publishEvent(new FlowableAddUserToGroupEvent(memberUser));
-//        }
-//        return ResultRespone.success(save);
-//    }
-//
-//    /**
-//     * 修改职位表
-//     * @param position 职位表
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title="修改用户职位" )
-//    @ApiOperation(value = "修改用户职位")
-//    @PutMapping
-//    public ResultRespone updateById(@RequestBody Position position) {
-//        Position positionOld=positionService.getById(position.getId());
-//        boolean b = positionService.updateById(position);
-//        if(b){
-//            //先删除再增加
-//            MemberUser memberUser=new MemberUser();
-//            memberUser.setGroupId(positionOld.getCategory());
-//            memberUser.setUser(userService.getById(positionOld.getUserId()));
-//            //调用工作流接口
-//            SpringContextHolder.publishEvent(new FlowableDeleteUserToGroupEvent(memberUser));
-//            memberUser=new MemberUser();
-//            memberUser.setGroupId(position.getCategory());
-//            memberUser.setUser(userService.getById(position.getUserId()));
-//            //调用工作流接口
-//            SpringContextHolder.publishEvent(new FlowableAddUserToGroupEvent(memberUser));
-//        }
-//        return ResultRespone.success();
-//    }
-//
-//    /**
-//     * 通过id删除职位表
-//     * @param id id
-//     * @return ResultRespone
-//     */
-//    @ToFlyAppLog(title="通过id删除用户职位" )
-//    @ApiOperation(value = "通过ID删除用户职位")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-//    })
-//    @DeleteMapping("/{id}" )
-//    public ResultRespone removeById(@PathVariable Long id) {
-//        Position position=positionService.getById(id);
-//        boolean b = positionService.removeById(id);
-//        if(b){
-//            MemberUser memberUser=new MemberUser();
-//            memberUser.setGroupId(position.getCategory());
-//            memberUser.setUser(userService.getById(position.getUserId()));
-//            //调用工作流接口
-//            SpringContextHolder.publishEvent(new FlowableDeleteUserToGroupEvent(memberUser));
-//        }
-//        return ResultRespone.success(b);
-//    }
-//}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/ProjectinfoController.java

@@ -1,160 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.tofly.base.entity.Projectinfo;
-import com.tofly.base.service.ProjectinfoService;
-import com.tofly.common.core.constant.CommonConstants;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.core.util.StringUtil;
-import com.tofly.common.ftp.config.FtpUtil;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import com.tofly.common.oauth.util.SecurityUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-/**
- * 项目基本信息表
- *
- * @author wangjian
- * @date Tue Mar 24 00:00:00 CST 2020
- */
-@RestController
-@RequestMapping("/projectinfo")
-@Api(tags="项目基本信息表接口")
-public class ProjectinfoController {
-
-    @Value("${user.logo}")
-    private String logoPath;
-
-    @Autowired
-    private   ProjectinfoService projectinfoService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param projectinfo 项目基本信息表
-    * @return
-    */
-//    @GetMapping("/page" )
-//    @ApiOperation(value = "分页查询")
-//    public ResultRespone getProjectinfoPage(Page page, @ModelAttribute Projectinfo projectinfo) {
-//      return ResultRespone.success(projectinfoService.page(page, Wrappers.query(projectinfo)));
-//    }
-
-
-    /**
-     * 通过id查询项目基本信息表
-     * @param id id
-     * @return ResultRespone
-     */
-//    @GetMapping("/{id}" )
-//    @ApiOperation(value = "通过ID查询")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-//    })
-//    public ResultRespone getById(@PathVariable("id" ) Long id) {
-//      return ResultRespone.success(projectinfoService.getById(id));
-//    }
-
-
-    /**
-     * 查询项目基本信息表
-     * @return ResultRespone
-     */
-    @GetMapping("/get" )
-    @ApiOperation(value = "查询基本信息")
-    public ResultRespone get() {
-        return ResultRespone.success(projectinfoService.getOne(Wrappers.query()));
-    }
-
-    /**
-     * 新增项目基本信息表
-     * @param projectinfo 项目基本信息表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增项目基本信息表" )
-    @ApiOperation(value = "新增项目基本信息表")
-    @PostMapping
-    public ResultRespone save(MultipartFile file, Projectinfo projectinfo) {
-
-        List<Projectinfo> list =  projectinfoService.list();
-        if(list.size()>0){
-            return ResultRespone.failed("项目的基本信息已存在，不能新增，只能修改");
-        }
-//        if(checkAuth()){
-//            return ResultRespone.failed("必须是超级管理员才能操作");
-//        }
-
-        if(file!=null){
-            String filename = logoPath+ IdWorker.getIdStr()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-            boolean b= FtpUtil.uploadFile2Ftp(file,filename);
-            if(b){
-                projectinfo.setProjectLogo(filename);
-            }else{
-                return ResultRespone.failed("上传到FTP失败");
-            }
-        }
-      return ResultRespone.success(projectinfoService.save(projectinfo));
-    }
-
-    /**
-     * 修改项目基本信息表
-     * @param projectinfo 项目基本信息表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改项目基本信息表" )
-    @ApiOperation(value = "修改项目基本信息表")
-    @PutMapping
-    public ResultRespone updateById(MultipartFile file, Projectinfo projectinfo) {
-//        if(checkAuth()){
-//            return ResultRespone.failed("必须是超级管理员才能操作");
-//        }
-
-        if(file!=null){
-            String filename = logoPath+ IdWorker.getIdStr()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-            boolean b= FtpUtil.uploadFile2Ftp(file,filename);
-            if(b){
-                //查找以前的FTP并删除
-                Projectinfo oldprojectinfo=projectinfoService.getOne(Wrappers.query());
-                //如果logo不为空，需要清空以前的logo
-                if(!StringUtil.isEmpty(oldprojectinfo.getProjectLogo())){
-                    FtpUtil.deleteFile(oldprojectinfo.getProjectLogo());
-                }
-                projectinfo.setProjectLogo(filename);
-            }else{
-                return ResultRespone.failed("上传到FTP失败");
-            }
-        }
-      return ResultRespone.success(projectinfoService.updateById(projectinfo));
-    }
-
-    private boolean checkAuth(){
-        return !CommonConstants.SUPER_ADMIN_ULEVEL.equals(SecurityUtils.getUser().getUserLevel());
-    }
-
-    /**
-     * 通过id删除项目基本信息表
-     * @param id id
-     * @return ResultRespone
-     */
-//    @ToFlyAppLog(title="通过id删除项目基本信息表" )
-//    @ApiOperation(value = "通过ID删除项目基本信息表")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-//    })
-//    @DeleteMapping("/{id}" )
-//    public ResultRespone removeById(@PathVariable Long id) {
-//      return ResultRespone.success(projectinfoService.removeById(id));
-//    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/RoleController.java

@@ -1,316 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.dto.RoleMenuDTO;
-import com.tofly.base.entity.BaseSys;
-import com.tofly.base.entity.Role;
-import com.tofly.base.entity.RoleMenu;
-import com.tofly.base.service.BaseSysService;
-import com.tofly.base.service.BaseSysmenuService;
-import com.tofly.base.service.RoleMenuService;
-import com.tofly.base.service.RoleService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.core.util.StringUtil;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import com.tofly.common.oauth.util.SecurityUtils;
-import io.swagger.annotations.*;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static com.baomidou.mybatisplus.core.toolkit.Wrappers.update;
-
-/**
- * 角色信息表
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/role")
-@Api(tags = "角色管理")
-public class RoleController {
-
-    private final RoleService roleService;
-
-    private final BaseSysmenuService baseSysmenuService;
-
-    private final BaseSysService baseSysService;
-
-    private final RoleMenuService roleMenuService;
-
-    /**
-     * 分页查询
-     *
-     * @param page 分页对象
-     * @param role 角色信息表
-     * @return
-     */
-    @GetMapping("/page")
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getRolePage(Page page, @ModelAttribute Role role) {
-        return ResultRespone.success(roleService.page(page, Wrappers.query(role).orderByDesc("update_time")));
-    }
-
-
-    /**
-     * 分页查询
-     *
-     * @param page 分页对象
-     * @param role 角色信息表
-     * @return
-     */
-    @GetMapping("/pageTree")
-    @ApiOperation(value = "分页查询(树状)")
-    public ResultRespone getRolePageTree(Page page, @ModelAttribute Role role) {
-        //不能使用pageMap的方法否则TreeValue无法转为String类型
-        IPage<Role> page1 = roleService.page(page, Wrappers.query(role).orderByDesc("update_time"));
-        Map<String, Object> map = new HashMap<>();
-        page1.getRecords().stream().forEach(r -> {
-            String pathids = r.getTreeValue();
-            String sysid = r.getSysId();
-            map.put("treeList", baseSysmenuService.getTreeSys(sysid, pathids));
-            map.put("role", r);
-        });
-        return ResultRespone.success(page1);
-    }
-
-    /**
-     * 分页查询
-     *
-     * @param role 角色信息表
-     * @return
-     */
-    @GetMapping("/list")
-    @ApiOperation(tags = {"用户管理", "角色管理"}, value = "角色列表")
-    public ResultRespone getRoleList(@ModelAttribute Role role) {
-        return ResultRespone.success(roleService.list(Wrappers.query(role).orderByDesc("update_time")));
-    }
-
-    /**
-     * 获取子系统列表
-     *
-     * @param sysId 子系统ID
-     * @return
-     */
-    @GetMapping("/getSysid")
-    @ApiOperation(value = "查询子系统")
-    public ResultRespone getRoleList(String sysId) {
-
-        return ResultRespone.success(baseSysmenuService.getTreeSys(sysId));
-    }
-
-
-    /**
-     * 列表查询
-     *
-     * @return
-     */
-    @GetMapping("/sysList")
-    @ApiOperation(value = "子系统列表")
-    public ResultRespone getBaseSysmenuPage() {
-        List list = baseSysService.listMaps(Wrappers.<BaseSys>lambdaQuery()
-                .select(BaseSys::getSysid, BaseSys::getSysname).orderByAsc(BaseSys::getCreateTime));
-        return ResultRespone.success(list);
-    }
-
-
-    /**
-     * 通过id查询角色信息表
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}")
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id") Long id) {
-        return ResultRespone.success(roleService.getById(id));
-    }
-
-
-    /**
-     * 通过id查询角色信息表
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/getTreeById/{id}")
-    @ApiOperation(value = "通过ID查询(树状)")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getByIdTree(@PathVariable("id") Long id) {
-        Map<String, Object> map = roleService.getMap(Wrappers.<Role>lambdaQuery()
-                .eq(Role::getId, id));
-        String pathids = (String) map.get("treeValue");
-        String sysid = (String) map.get("sysId");
-        map.put("treeList", baseSysmenuService.getTreeSys(sysid, pathids));
-        return ResultRespone.success(map);
-    }
-
-    /**
-     * 新增角色信息表
-     *
-     *
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "新增角色信息表")
-    @ApiOperation(value = "新增角色信息表")
-    @PostMapping
-    public ResultRespone save(@RequestBody RoleMenuDTO roleMenuDTO) {
-        //需要判断角色是否重复，重复的角色不能重建
-        //需要判断角色是否重复，重复的角色不能重建
-        Boolean b =roleService.selectByRoleName(roleMenuDTO.getRoleName());
-        Role role = new Role();
-        if (b){
-            role.setRoleName(roleMenuDTO.getRoleName());
-            role.setRoleDesc(roleMenuDTO.getRoleDesc());
-            role.setTreeValue(roleMenuDTO.getMenuIds());
-            roleService.save(role);
-            if(!StringUtil.isEmpty(roleMenuDTO.getMenuIds())){
-                String[] menu=roleMenuDTO.getMenuIds().split(",");
-                RoleMenu roleMenu;
-                for(String s:menu){
-                    roleMenu = new RoleMenu();
-                    roleMenu.setMenuId(Long.valueOf(s));
-                    roleMenu.setRoleId(role.getId());
-                    roleMenuService.save(roleMenu);
-                }
-            }
-            return ResultRespone.success();
-        }
-        return ResultRespone.failed("创建的角色名称已经存在请重新创建角色名称");
-    }
-
-    /**
-     * 修改角色信息表
-     *
-     * @param role 角色信息表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "修改角色信息表")
-    @ApiOperation(value = "修改角色信息表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody Role role) {
-        //需要判断角色是否重复，重复的角色不能重建
-        Boolean b =roleService.selectByRoleName(role.getRoleName());
-        role.setUpdateUsers(SecurityUtils.getUserName());
-        if (b){
-            return ResultRespone.success(roleService.updateById(role));
-        }
-        return ResultRespone.failed("修改的角色名称已存在");
-    }
-
-    /**
-     * 通过id删除角色信息表
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "通过id删除角色信息表")
-    @ApiOperation(value = "通过ID删除角色信息表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}")
-    public ResultRespone removeById(@PathVariable Long id) {
-        //非传统意义删除，修改禁用标志
-        Role role = new Role();
-        role.setId(id);
-        role.setStatusFlag("0");
-
-        return ResultRespone.success(update(role));
-
-        //return ResultRespone.success(roleService.removeById(id));
-    }
-
-
-
-    /**
-     * 通过id查询菜单列表
-     * @param id id
-     * @return ResultRespone
-     */
-//    @GetMapping("/menuList/{id}" )
-//    @ApiOperation(value = "通过角色ID查询菜单列表")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-//    })
-//    public ResultRespone getMenuList(@PathVariable("id" ) Long id) {
-//        return ResultRespone.success(roleService.getMenuListByRole(id));
-//    }
-
-    /**
-     * 通过id查询菜单列表
-     * @param id id
-     * @return ResultRespone
-     */
-//    @GetMapping("/menuListById" )
-//    @ApiOperation(value = "通过角色ID查询菜单列表,包含所有菜单")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "id", value = "角色ID", required = true, dataType = "Long")
-//    })
-//    public ResultRespone getMenuListById(Long id) {
-//        return ResultRespone.success(roleService.listMenuByRoleId(id));
-//    }
-//
-
-    /**
-     * 通过id查询角色信息表
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/userList/{id}")
-    @ApiOperation(value = "通过角色ID查询用户列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone userList(@PathVariable("id") Long id) {
-        return ResultRespone.success(roleService.getExistUserListByRole(id));
-    }
-
-    /**
-     * 通过id查询不存在的用户列表
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/noUserList/{id}")
-    @ApiOperation(value = "通过角色id查询不存在的用户列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone noUserList(@PathVariable("id") Long id) {
-        return ResultRespone.success(roleService.getNoExistUserListByRole(id));
-    }
-
-    /**
-     * 通过id删除角色
-     *
-     * @param ids id数组
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "通过id删除角色")
-    @ApiOperation(value = "通过ID删除角色")
-    @DeleteMapping("/removeByIds")
-    public ResultRespone removeByIds(@ApiParam(value = "通过ID拼接的字符串,以逗号隔开.如,'1,2,3,4,5,6,7", name = "ids", required = true) String ids) {
-        String msg = roleService.deleteRolesByIds(ids);
-        return StringUtil.isEmpty(msg) ? ResultRespone.success(true) : ResultRespone.failed(msg);
-    }
-
-}
-

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/RoleDeptController.java

@@ -1,100 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import com.tofly.base.entity.RoleDept;
-import com.tofly.base.service.RoleDeptService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import org.springframework.web.bind.annotation.ModelAttribute;
-
-/**
- * 角色部门关系表
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/roledept")
-@Api(tags="角色部门关系表接口")
-public class RoleDeptController {
-
-    private final  RoleDeptService roleDeptService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param roleDept 角色部门关系表
-    * @return
-    */
-    @GetMapping("/page" )
-    //@ApiOperation(value = "分页查询")
-    public ResultRespone getRoleDeptPage(Page page, @ModelAttribute RoleDept roleDept) {
-      return ResultRespone.success(roleDeptService.page(page, Wrappers.query(roleDept)));
-    }
-
-
-    /**
-     * 通过id查询角色部门关系表
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    //@ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(roleDeptService.getById(id));
-    }
-
-    /**
-     * 新增角色部门关系表
-     * @param roleDept 角色部门关系表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增角色部门关系表" )
-    //@ApiOperation(value = "新增角色部门关系表")
-    @PostMapping
-    public ResultRespone save(@RequestBody RoleDept roleDept) {
-      return ResultRespone.success(roleDeptService.save(roleDept));
-    }
-
-    /**
-     * 修改角色部门关系表
-     * @param roleDept 角色部门关系表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改角色部门关系表" )
-    //@ApiOperation(value = "修改角色部门关系表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody RoleDept roleDept) {
-      return ResultRespone.success(roleDeptService.updateById(roleDept));
-    }
-
-    /**
-     * 通过id删除角色部门关系表
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除角色部门关系表" )
-    //@ApiOperation(value = "通过ID删除角色部门关系表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-      return ResultRespone.success(roleDeptService.removeById(id));
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/RoleMenuController.java

@@ -1,123 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.dto.RoleMenuDTO;
-import com.tofly.base.entity.Role;
-import com.tofly.base.entity.RoleMenu;
-import com.tofly.base.service.RoleMenuService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import io.swagger.annotations.*;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 角色菜单表
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/rolemenu")
-@Api(tags="角色菜单表接口")
-public class RoleMenuController {
-
-    private final  RoleMenuService roleMenuService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param roleMenu 角色菜单表
-    * @return
-    */
-    @GetMapping("/page" )
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getRoleMenuPage(Page page, @ModelAttribute RoleMenu roleMenu) {
-      return ResultRespone.success(roleMenuService.page(page, Wrappers.query(roleMenu)));
-    }
-
-
-    /**
-     * 通过id查询角色菜单表
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    //@ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(roleMenuService.getById(id));
-    }
-
-    /**
-     * 新增角色菜单表
-     * @param roleMenu 角色菜单表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增角色菜单表" )
-    //@ApiOperation(value = "新增角色菜单表")
-    @PostMapping("/save")
-    public ResultRespone save(@RequestBody RoleMenu roleMenu) {
-        return ResultRespone.success(roleMenuService.save(roleMenu));
-    }
-
-    /**
-     * 修改角色菜单表
-     * @param roleMenu 角色菜单表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改角色菜单表" )
-    //@ApiOperation(value = "修改角色菜单表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody RoleMenu roleMenu) {
-      return ResultRespone.success(roleMenuService.updateById(roleMenu));
-    }
-
-    /**
-     * 通过id删除角色菜单表
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除角色菜单表" )
-    //@ApiOperation(value = "通过ID删除角色菜单表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-      return ResultRespone.success(roleMenuService.removeById(id));
-    }
-
-//    @ToFlyAppLog(title="新增角色菜单表" )
-//    @ApiOperation(tags = "角色管理", value = "新增角色菜单")
-//    @PostMapping("/addBatch")
-//    public ResultRespone addBatch(@RequestBody List<RoleMenu> roleMenu){
-//        return ResultRespone.success(roleMenuService.saveBatch(roleMenu));
-//    }
-
-    @ToFlyAppLog(title="修改角色菜单" )
-    @ApiOperation(tags = "角色管理", value = "修改角色菜单")
-    @PutMapping("/updateBatch")
-    public ResultRespone updateBatch(@RequestBody RoleMenu[] roleMenu){
-        return ResultRespone.success(roleMenuService.updateBatch(roleMenu));
-    }
-
-    /**
-     * 角色菜单绑定
-     *
-     */
-    @ToFlyAppLog
-    @ApiOperation(value = "角色菜单绑定")
-    @PostMapping("/roleMenuBound")
-    public ResultRespone roleMenuBound(@RequestBody RoleMenuDTO roleMenuDTO) {
-        return ResultRespone.success(roleMenuService.roleMenuBound(roleMenuDTO));
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/SdeversionController.java

@@ -1,113 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.entity.Sdeversion;
-import com.tofly.base.entity.UserSdeversion;
-import com.tofly.base.service.SdeversionService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 上图员数据版本记录表
- *
- * @author wangjian
- * @date Thu Apr 09 00:00:00 CST 2020
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/sdeversion")
-@Api(tags="上图员数据版本记录表接口")
-public class SdeversionController {
-
-    private final  SdeversionService sdeversionService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param sdeversion 上图员数据版本记录表
-    * @return
-    */
-    @GetMapping("/page" )
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getSdeversionPage(Page page, @ModelAttribute Sdeversion sdeversion) {
-      return ResultRespone.success(sdeversionService.page(page, Wrappers.query(sdeversion)));
-    }
-
-    /**
-     * 分页查询
-     * @param page 分页对象
-     * @param sdeversion 上图员数据版本记录表
-     * @return
-     */
-    @GetMapping("/userPage" )
-    @ApiOperation(value = "查询用户数据版本记录")
-    public ResultRespone getUserPage(Page page, @ModelAttribute UserSdeversion sdeversion) {
-        return ResultRespone.success(sdeversionService.getUserSdeversionMap(page,sdeversion));
-    }
-
-
-    /**
-     * 通过id查询上图员数据版本记录表
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(sdeversionService.getById(id));
-    }
-
-    /**
-     * 新增上图员数据版本记录表
-     * @param sdeversion 上图员数据版本记录表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增上图员数据版本记录表" )
-    @ApiOperation(value = "新增上图员数据版本记录表")
-    @PostMapping
-    public ResultRespone save(@RequestBody Sdeversion sdeversion) {
-      return ResultRespone.success(sdeversionService.save(sdeversion));
-    }
-
-    /**
-     * 修改上图员数据版本记录表
-     * @param sdeversion 上图员数据版本记录表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改上图员数据版本记录表" )
-    @ApiOperation(value = "修改上图员数据版本记录表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody Sdeversion sdeversion) {
-      return ResultRespone.success(sdeversionService.updateById(sdeversion));
-    }
-
-    /**
-     * 通过id删除上图员数据版本记录表
-     * @param userId userId
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过用户id删除上图员数据版本记录表" )
-    @ApiOperation(value = "通过用户ID删除上图员数据版本记录表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{userId}" )
-    public ResultRespone removeById(@PathVariable Long userId) {
-      return ResultRespone.success(sdeversionService.remove(Wrappers.<Sdeversion>lambdaQuery()
-              .eq(Sdeversion::getUserId,userId)));
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/SourceController.java

@@ -1,198 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.dto.SorceTreeDTO;
-import com.tofly.base.entity.Departmentsource;
-import com.tofly.base.entity.Source;
-import com.tofly.base.service.DepartmentsourceService;
-import com.tofly.base.service.SourceService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.core.util.JSONUtil;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import io.swagger.annotations.*;
-import lombok.AllArgsConstructor;
-import org.apache.commons.beanutils.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * 系统资源配置信息表
- *修改后（服务类型表）
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/source")
-@Api(tags = "资源管理")
-public class SourceController {
-
-    private final SourceService sourceService;
-
-    private final DepartmentsourceService departmentsourceService;
-
-
-    /**
-     * 分页查询
-     *
-     * @param page   分页对象
-     * @param source 系统资源配置信息表
-     * @return
-     */
-    @GetMapping("/page")
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getSourcePage(Page page, @ModelAttribute Source source) {
-        return ResultRespone.success(sourceService.page(page, Wrappers.query(source)));
-    }
-
-    /**
-     * 列表查询
-     *
-     * @param source 系统资源配置信息表
-     * @return
-     */
-    @GetMapping("/list")
-    @ApiOperation(tags = {"部门管理", "资源管理"}, value = "资源列表")
-    public ResultRespone getSourcePage(@ModelAttribute Source source) {
-        return ResultRespone.success(sourceService.list(Wrappers.query(source)).stream()
-                .sorted(Comparator.comparing(Source::getCreateTime, Comparator.reverseOrder())
-                        .thenComparing(Source::getId, Comparator.reverseOrder())));
-    }
-
-    /**
-     * 树形结构
-     *
-     * @param
-     * @return
-     */
-    @GetMapping("/getTreeList")
-    @ApiOperation(tags = { "资源管理"}, value = "树形资源列表")
-    public ResultRespone getTreeList() throws InvocationTargetException, IllegalAccessException {
-        List<Source> sourceList = sourceService.list();
-        List<SorceTreeDTO> sorceTreeDTOS = new ArrayList<>();
-        for (Source l:sourceList){
-            SorceTreeDTO sorceTreeDTO = new SorceTreeDTO();
-            BeanUtils.copyProperties(sorceTreeDTO,l);
-            sorceTreeDTOS.add(sorceTreeDTO);
-        }
-        return ResultRespone.success(JSONUtil.parTree(sorceTreeDTOS,SorceTreeDTO::getId,SorceTreeDTO::getPid,SorceTreeDTO::getList));
-    }
-
-    /**
-     * 通过id查询系统资源配置信息表
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}")
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id") Long id) {
-        return ResultRespone.success(sourceService.getById(id));
-    }
-
-    /**
-     * 通过服务表的id来查询资源表
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/selectSourceById")
-    @ApiOperation(value = "通过服务表的id来查询资源表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long"),
-            @ApiImplicitParam(name = "cval", value = "资源值", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "id", value = "名称", required = true, dataType = "String")
-    })
-    public ResultRespone selectSourceById( Long id,String cval,String name) {
-        return ResultRespone.success(sourceService.selectSourceById(id,cval,name));
-    }
-
-
-    /**
-     * 新增系统资源配置信息表
-     *
-     * @param source 系统资源配置信息表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "")
-    @ApiOperation(value = "新增系统资源配置信息表")
-    @PostMapping
-    public ResultRespone save(@RequestBody Source source) {
-        return ResultRespone.success(sourceService.save(source));
-    }
-
-    /**
-     * 修改系统资源配置信息表
-     *
-     * @param source 系统资源配置信息表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "修改系统资源配置信息表")
-    @ApiOperation(value = "修改系统资源配置信息表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody Source source) {
-        return ResultRespone.success(sourceService.updateById(source));
-    }
-
-    /**
-     * 通过id删除系统资源配置信息表
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "通过id删除系统资源配置信息表")
-    @ApiOperation(value = "通过ID删除系统资源配置信息表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}")
-    public ResultRespone removeById(@PathVariable Long id) {
-        return ResultRespone.success(sourceService.removeById(id));
-    }
-
-    /**
-     * 通过id删除资源
-     *
-     * @param ids id数组
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title = "通过id删除资源")
-    @ApiOperation(value = "通过ID删除资源")
-    @DeleteMapping("/removeByIds")
-    public ResultRespone removeByIds(@ApiParam(value = "通过ID拼接的字符串,以逗号隔开.如,'1,2,3,4,5,6,7", name = "ids", required = true) String ids) {
-        String[] idss = ids.split(",");
-        List<Long> list = new ArrayList();
-        boolean flag = true;
-        StringBuffer sb = new StringBuffer();
-        for (String id : idss) {
-            //查询单位是否存在该资源
-            List<Departmentsource> sourceList = departmentsourceService.list(Wrappers.<Departmentsource>lambdaQuery()
-                    .eq(Departmentsource::getSourceId, Long.valueOf(id)));
-
-            if (sourceList.size() > 0) {
-                flag = false;
-                sb.append("id:").append(id).append(",该资源还存在").append(sourceList.size())
-                        .append("个单位正在使用;");
-            }
-            list.add(Long.valueOf(id));
-        }
-        if (flag) {
-            return ResultRespone.success(sourceService.removeByIds(list));
-        } else {
-            return ResultRespone.failed("还存在单位在使用该资源，不能删除：" + sb.toString());
-        }
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/SourcedicController.java

@@ -1,183 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.entity.Source;
-import com.tofly.base.entity.Sourcedic;
-import com.tofly.base.service.SourceService;
-import com.tofly.base.service.SourcedicService;
-import com.tofly.base.vo.ServiceVO;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import io.swagger.annotations.*;
-import lombok.AllArgsConstructor;
-import org.apache.commons.beanutils.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-
-/**
- * 系统资源配置字典表
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/sourcedic")
-@Api(tags="系统资源配置字典表接口（服务类型）")
-public class SourcedicController {
-
-    private final  SourcedicService sourcedicService;
-    
-    private final SourceService sourceService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param sourcedic 系统资源配置字典表
-    * @return
-    */
-    @GetMapping("/page" )
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getSourcedicPage(Page page, @ModelAttribute Sourcedic sourcedic) {
-      return ResultRespone.success(sourcedicService.page(page, Wrappers.query(sourcedic)));
-    }
-
-
-    /**
-     * 通过id查询系统资源配置字典表
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(sourcedicService.getById(id));
-    }
-
-     /*
-     * 新增系统资源配置字典表
-     * @param sourcedic 系统资源配置字典表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增系统资源配置字典表" )
-    @ApiOperation(value = "新增系统资源配置字典表")
-    @PostMapping
-    public ResultRespone save(@RequestBody Sourcedic sourcedic) {
-        //判断编码是否存在
-        boolean b = sourcedicService.selectByCode(sourcedic.getCode());
-        if (b){
-            return ResultRespone.success(sourcedicService.save(sourcedic));
-        }
-        return ResultRespone.failed("创建资源编码已存在，请重新创建资源编码");
-    }
-
-     /*
-     * 修改系统资源配置字典表
-     * @param sourcedic 系统资源配置字典表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改系统资源配置字典表" )
-    @ApiOperation(value = "修改系统资源配置字典表")
-    @PutMapping("/update")
-    public ResultRespone updateById(@RequestBody Sourcedic sourcedic) {
-        //判断编码是否存在
-//        boolean b = sourcedicService.selectByCode(sourcedic.getCode());
-//        if (b){
-            return ResultRespone.success(sourcedicService.updateById(sourcedic));
-//        }
-//        return ResultRespone.failed("当前资源编码已存在");
-    }
-
-    /*
-     * 通过id删除系统资源配置字典表
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除系统资源配置字典表" )
-    @ApiOperation(value = "通过ID删除系统资源配置字典表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-      return ResultRespone.success(sourcedicService.removeById(id));
-    }
-
-    /**
-     * 通过id删除资源字典
-     * @param ids id数组
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除资源字典" )
-    @ApiOperation(value = "通过ID删除资源字典")
-    @DeleteMapping("/removeByIds" )
-    public ResultRespone removeByIds(@ApiParam(value = "通过ID拼接的字符串,以逗号隔开.如,'1,2,3,4,5,6,7",name = "ids",required = true) String ids) {
-        String[] idss=ids.split(",");
-        List<Long> list=new ArrayList();
-        boolean flag=true;
-        StringBuffer sb=new StringBuffer();
-        for(String id:idss){
-            //查询资源是否存在该资源字典
-            List<Source> sourceList=sourceService.list(Wrappers.<Source>lambdaQuery()
-                    .eq(Source::getPid,Long.valueOf(id)));
-
-            if(sourceList.size()>0){
-                flag=false;
-                sb.append("id:").append(id).append(",该字典还有存在对应资源").append(sourceList.size())
-                        .append("条;");
-            }
-            list.add(Long.valueOf(id));
-        }
-        if(flag){
-            return ResultRespone.success(sourcedicService.removeByIds(list));
-        }else {
-            return ResultRespone.failed("还存在资源在使用该字典，不能删除："+sb.toString());
-        }
-    }
-
-
-    /**
-     * 树形结构
-     *
-     * @param
-     * @return
-     */
-    @GetMapping("/getTreeService")
-    @ApiOperation(tags = { "树形资源列表"}, value = "树形资源列表")
-    public ResultRespone getTreeService() {
-        List< ServiceVO> voList = new ArrayList<>();
-        List<Sourcedic> sourcedics = sourcedicService.list();
-        List<Source> sourceList =sourceService.list();
-        if (CollectionUtils.isEmpty(sourceList)&&CollectionUtils.isEmpty(sourcedics)){
-            ResultRespone.failed("服务和资源为空");
-        }
-        Map<Long, List<Source>> longListMap = sourceList.stream().collect(Collectors.groupingBy(Source::getPid));
-        for (Sourcedic sourcedic: sourcedics){
-            ServiceVO serviceVO = new ServiceVO();
-            serviceVO.setCode(sourcedic.getCode());
-            serviceVO.setCreateTime(sourcedic.getCreateTime());
-            serviceVO.setCreateUser(sourcedic.getCreateUser());
-            serviceVO.setId(sourcedic.getId());
-            serviceVO.setName(sourcedic.getName());
-            serviceVO.setType(sourcedic.getType());
-            serviceVO.setChild(longListMap.get(sourcedic.getId()));
-            voList.add(serviceVO);
-        }
-        return ResultRespone.success(voList);
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/SyschildcodeController.java

@@ -1,184 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.entity.Syschildcode;
-import com.tofly.base.service.SyschildcodeService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.core.util.StringUtil;
-import com.tofly.common.oauth.exception.ToflyDeniedException;
-import io.swagger.annotations.*;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 系统通用码表子级表
- *
- * @author wangjieliu
- * @date Thu Mar 18 00:00:00 CST 2021
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/syscommoncode")
-@Api(tags = "系统通用码表接口")
-public class SyschildcodeController {
-
-    private final SyschildcodeService syschildcodeService;
-
-    /**
-     * 新增系统通用码表子级表
-     *
-     * @param syschildcode 系统通用码表子级表
-     * @return ResultRespone
-     */
-    @ApiOperation(value = "新增系统通用码表")
-    @PostMapping
-    public ResultRespone save(@RequestBody Syschildcode syschildcode) {
-        if (StringUtil.isEmpty(syschildcode.getFlag())) {
-            throw new ToflyDeniedException("请输入编码标识");
-        }
-        return ResultRespone.success(syschildcodeService.insert(syschildcode));
-    }
-
-    @ApiModelProperty(value = "通过ID得到编码名称")
-    @GetMapping("/getname")
-    @ResponseBody
-    public String getname(Long id) {
-        return syschildcodeService.getOne(Wrappers.<Syschildcode>lambdaQuery().eq(Syschildcode::getId, id).select(Syschildcode::getCname)).getCname();
-    }
-
-    @ApiOperation(value = "分页获取编码")
-    @GetMapping("/getByObj")
-    public IPage<Syschildcode> getByObj(Syschildcode syschildcode, Page page) {
-        String cname = syschildcode.getCname();
-        String pcname = syschildcode.getPcname();
-        Long pid = syschildcode.getPcid();
-        return syschildcodeService.page(page, Wrappers.<Syschildcode>lambdaQuery()
-                .eq(Syschildcode::getCdisable, "1")
-                .like(StringUtil.isNotEmpty(cname), Syschildcode::getCname, cname)
-                .eq(StringUtil.isNotEmpty(pcname), Syschildcode::getPcname, pcname)
-                .eq(StringUtil.isNotNull(pid), Syschildcode::getPcid, pid));
-    }
-
-    @ApiOperation(value = "获取父级和子级所有目录")
-    @GetMapping("/all")
-    public ResultRespone get() {
-        return ResultRespone.success(syschildcodeService.getAll());
-    }
-
-    /**
-     * 分页查询
-     *
-     * @return
-     */
-    @GetMapping("/fj")
-    @ApiOperation(value = "父级菜单查看")
-    public ResultRespone getSysparentcodePage() {
-
-        return ResultRespone.success(syschildcodeService.getfj());
-    }
-
-
-    @ApiOperation(value = "根据父级ID获取下拉菜单")
-    @GetMapping("/getByfjId")
-    public ResultRespone getConfig(String pCid) {
-        List<String> list = Arrays.asList(pCid.split(","));
-        return ResultRespone.success(syschildcodeService.getBylistPcid(list));
-    }
-
-
-    @ApiOperation(value = "根据条件获取子级编码信息")
-    @PostMapping("/getChild")
-    public ResultRespone getChild(@RequestBody Syschildcode code) {
-        return ResultRespone.success(syschildcodeService.list(Wrappers.query(code)));
-    }
-
-    /**
-     * 通过id查询系统通用码表子级表
-     *
-     * @param ccid id
-     * @return ResultRespone
-     */
-    @GetMapping("/{ccid}")
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ccid", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("ccid") Long ccid) {
-        return ResultRespone.success(syschildcodeService.getById(ccid));
-    }
-
-
-    /**
-     * 修改系统通用码表子级表
-     *
-     * @param syschildcode 系统通用码表子级表
-     * @return ResultRespone
-     */
-    @ApiOperation(value = "修改系统通用码表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody Syschildcode syschildcode) {
-        //修改前查询是否系统编码，如果是系统编码，则无法修改
-//        String flag = syschildcodeService.getOne(Wrappers.<Syschildcode>lambdaQuery().eq(Syschildcode::getId, syschildcode.getId()).select(Syschildcode::getFlag)).getFlag();
-//        if ("1".equals(flag)) {
-//            throw new ToflyDeniedException("该编码是系统编码，无法修改");
-//        }
-        //由于编码表特殊；修改删除会影响系统的进行；所以目前只能修改厂家的编码
-        Long cjId = 2L;
-        if (!cjId.equals(syschildcode.getPcid())) {
-            throw new ToflyDeniedException("修改失败");
-        }
-        if (StringUtil.isNotNull(syschildcode.getPcid())) {
-            Syschildcode code = syschildcodeService.getOne(Wrappers.<Syschildcode>lambdaQuery().eq(Syschildcode::getCname, syschildcode.getCname())
-                    .eq(Syschildcode::getPcid, syschildcode.getPcid()).ne(Syschildcode::getId , syschildcode.getId()));
-            if (StringUtil.isNotNull(code)) {
-                throw new ToflyDeniedException("存在相同名字，请勿重复添加");
-            }
-            Syschildcode ccode = syschildcodeService.getOne(Wrappers.<Syschildcode>lambdaQuery().eq(Syschildcode::getCcode, syschildcode.getCcode())
-                    .eq(Syschildcode::getPcid, syschildcode.getPcid()).ne(Syschildcode::getId , syschildcode.getId()));
-            if (StringUtil.isNotNull(ccode)) {
-                throw new ToflyDeniedException("编码重复");
-            }
-        } else {
-            Syschildcode code = syschildcodeService.getOne(Wrappers.<Syschildcode>lambdaQuery().eq(Syschildcode::getCname, syschildcode.getCname())
-                    .isNull(Syschildcode::getPcid).ne(Syschildcode::getId , syschildcode.getId()));
-            if (StringUtil.isNotNull(code)) {
-                throw new ToflyDeniedException("存在相同名字，请勿重复添加");
-            }
-            Syschildcode ccode = syschildcodeService.getOne(Wrappers.<Syschildcode>lambdaQuery().eq(Syschildcode::getCcode, syschildcode.getCcode())
-                    .isNull(Syschildcode::getPcid).ne(Syschildcode::getId , syschildcode.getId()));
-            if (StringUtil.isNotNull(ccode)) {
-                throw new ToflyDeniedException("编码重复");
-            }
-        }
-        return ResultRespone.success(syschildcodeService.updateById(syschildcode));
-    }
-
-    /**
-     * 删除编码表
-     * 由于编码表的特殊性；怕删除后对系统有所影响；所以采用了字段软删除
-     *
-     * @param ids
-     * @return
-     */
-    @ApiOperation(value = "删除系统编码表")
-    @DeleteMapping("/{ids}")
-    public ResultRespone deleteByIds(@PathVariable("ids") String ids) {
-        if (StringUtil.isEmpty(ids)) {
-            throw new ToflyDeniedException("请传入编码id");
-        }
-        List<String> idList = Arrays.asList(ids.split(","));
-        return ResultRespone.success(syschildcodeService.update(Wrappers.<Syschildcode>lambdaUpdate()
-                .in(Syschildcode::getId, idList).set(Syschildcode::getCdisable, "0")));
-    }
-
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/SystemController.java

@@ -1,153 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.entity.Menu;
-import com.tofly.base.entity.System;
-import com.tofly.base.service.MenuService;
-import com.tofly.base.service.SystemService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import io.swagger.annotations.*;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 子系统配置信息表
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/system")
-@Api(tags="子系统管理")
-public class SystemController {
-
-    private final  SystemService systemService;
-
-    private final MenuService menuService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param system 子系统配置信息表
-    * @return
-    */
-    @GetMapping("/page" )
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getSystemPage(Page page, @ModelAttribute System system) {
-      //return ResultRespone.success(systemService.page(page, Wrappers.query(system)));
-        return ResultRespone.success(systemService.listSystemPage(page));
-    }
-
-    /**
-     * 列表查询
-     * @param system 子系统配置信息表
-     * @return
-     */
-    @GetMapping("/list" )
-    @ApiOperation(tags = {"用户管理","子系统管理"},value = "子系统列表")
-    public ResultRespone getSystemPage(System system) {
-        return ResultRespone.success(systemService.list(Wrappers.query(system)));
-    }
-
-
-    /**
-     * 通过id查询子系统配置信息表
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(systemService.getById(id));
-    }
-
-    /**
-     * 新增子系统配置信息表
-     * @param system 子系统配置信息表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增子系统配置信息表" )
-    @ApiOperation(value = "新增子系统配置信息表")
-    @PostMapping
-    public ResultRespone save(@RequestBody System system) {
-      return ResultRespone.success(systemService.save(system));
-    }
-
-    /**
-     * 修改子系统配置信息表
-     * @param system 子系统配置信息表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改子系统配置信息表" )
-    @ApiOperation(value = "修改子系统配置信息表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody  System system) {
-      return ResultRespone.success(systemService.updateById(system));
-    }
-
-    /**
-     * 通过id删除子系统配置信息表
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除子系统配置信息表" )
-    @ApiOperation(value = "通过ID删除子系统配置信息表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-        //非传统意义删除，修改禁用标志
-        System system=new System();
-        system.setId(id);
-        system.setStatusFlag("0");
-        return ResultRespone.success(systemService.updateById(system));
-    }
-
-    /**
-     * 通过id删除菜单
-     * @param ids id数组
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除子系统" )
-    @ApiOperation(value = "通过ID删除子系统")
-    @DeleteMapping("/removeByIds" )
-    public ResultRespone removeByIds(@ApiParam(value = "通过ID拼接的字符串,以逗号隔开.如,'1,2,3,4,5,6,7",name = "ids",required = true) String ids) {
-        String[] idss=ids.split(",");
-        List<Long> list=new ArrayList();
-        boolean flag=true;
-        StringBuffer sb=new StringBuffer();
-        for(String id:idss){
-            //查询是否存在子菜单
-            List<Menu> menuList=menuService.list(Wrappers.<Menu>lambdaQuery()
-                    .eq(Menu::getSysId,Long.valueOf(id)));
-
-            if(menuList.size()>0){
-                flag=false;
-                sb.append("id:").append(id).append(",对应子系统菜单还存在").append(menuList.size())
-                        .append("条数据;");
-            }
-            list.add(Long.valueOf(id));
-        }
-        if(flag){
-
-            return ResultRespone.success(systemService.removeByIds(list));
-        }else {
-            return ResultRespone.failed("还存在子系统菜单，不能删除："+sb.toString());
-        }
-    }
-
-   }

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/UnitManagementContriller.java

@@ -1,84 +0,0 @@
-package com.tofly.base.controller;
-
-
-import com.tofly.base.dto.CompanyDeptDto;
-import com.tofly.base.exception.BusinessException;
-import com.tofly.base.service.UnitManagementService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-
-@RestController
-@AllArgsConstructor
-@RequestMapping("/unitManagement")
-@Api(tags="单位管理接口")
-public class UnitManagementContriller {
-
-    @Autowired
-    private UnitManagementService unitManagementService;
-
-    @GetMapping("/getTreeList" )
-    @ApiOperation(value = "获取单位树形接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "companyName", value = "公司名称模糊查询", required = false, dataType = "String"),
-            @ApiImplicitParam(name = "deptName", value = "部门名称模糊查询", required = false, dataType = "String")
-    })
-    public ResultRespone getSystemPage(String companyName, String deptName) {
-
-        return ResultRespone.success(unitManagementService.getTreeList(companyName,deptName));
-    }
-
-
-    @ToFlyAppLog(title="新增单位/部门信息" )
-    @ApiOperation(value = "新增单位/部门信息")
-    @PostMapping("/saveCompanyDept")
-    public ResultRespone save(@RequestBody CompanyDeptDto dto) {
-        ResultRespone respone = new ResultRespone();
-        try {
-            respone.setResult(unitManagementService.saveCompanyDept(dto.getType(), dto.getCompany(), dto.getDepartment()));
-        }catch (BusinessException businessException) {
-        respone.setCode(businessException.getRetCd());
-        respone.setMessage(businessException.getMsgDes());
-    }
-        return respone;
-    }
-
-    @ToFlyAppLog(title="修改单位/部门信息" )
-    @ApiOperation(value = "修改单位/部门信息")
-    @PutMapping("/updateCompanyDept")
-    public ResultRespone update(@RequestBody CompanyDeptDto dto) {
-        ResultRespone respone = new ResultRespone();
-        try {
-            respone.setResult(unitManagementService.updateCompanyDept(dto.getType(), dto.getCompany(), dto.getDepartment()));
-        }catch (BusinessException businessException) {
-            respone.setCode(businessException.getRetCd());
-            respone.setMessage(businessException.getMsgDes());
-        }
-        return respone;
-    }
-
-
-    @ApiOperation(value = "通过ID批量删除新增单位/部门信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "type", value = "修改类型,1 为单位,2为部门", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "ids", value = "批量删除，多个id以逗号隔开", required = true, dataType = "String")
-    })
-    @DeleteMapping("/deleteByIds" )
-    public ResultRespone removeById(String type,String ids) {
-        ResultRespone respone = new ResultRespone();
-        try {
-            respone.setResult(unitManagementService.deleteCompanyDept(type,ids));
-        }catch (BusinessException businessException) {
-            respone.setCode(businessException.getRetCd());
-            respone.setMessage(businessException.getMsgDes());
-        }
-        return respone;
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/UserAscriptionController.java

@@ -1,159 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.em.Constant;
-import com.tofly.base.entity.App;
-import com.tofly.base.entity.UserAscription;
-import com.tofly.base.entity.dto.UserAscriptionDto;
-import com.tofly.base.service.AppService;
-import com.tofly.base.service.UserAscriptionService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.core.util.StringUtil;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import com.tofly.common.oauth.util.SecurityUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 用户归属管理
- *
- * @author fcl
- * @date Wed Mar 10 00:00:00 CST 2021
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/userAscription")
-@Api(tags = "用户归属管理")
-public class UserAscriptionController {
-
-    private final UserAscriptionService userAscriptionService;
-
-    /**
-     * 分页查询
-     *
-     * @param page           分页对象
-     * @param userAscription
-     * @return
-     */
-    @GetMapping("/page")
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getAppPage(Page page, @ModelAttribute UserAscription userAscription) {
-        return ResultRespone.success(userAscriptionService.page(page, Wrappers.query(userAscription)));
-    }
-
-    @GetMapping("/getUserAscriptionMap")
-    @ApiOperation(value = "查询父子级关系归属Map")
-    public ResultRespone getUserAscriptionMap(@ModelAttribute UserAscription userAscription) {
-        List<UserAscription> list = userAscriptionService.list(Wrappers.query(userAscription));
-        List<UserAscriptionDto> dtoList  = new ArrayList<>();
-        if(null!=list && list.size()>0){
-           // 父级分组
-            Map<String, List<UserAscription>> collect = list.stream().collect(Collectors.groupingBy(UserAscription::getParentUserLonginName));
-            collect.forEach((k,v)->{
-                UserAscriptionDto dto = new UserAscriptionDto();
-                dto.setParentUserLonginName(k);
-                List<String> userNameList = new ArrayList<>();
-                v.forEach(i->{
-                    userNameList.add(i.getUserLonginName());
-                });
-                dto.setUserLonginNameList(userNameList);
-                dtoList.add(dto);
-            });
-        }
-
-
-        return ResultRespone.success(dtoList);
-    }
-
-
-    /**
-     * 通过id查询
-     *
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}")
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id") Long id) {
-        return ResultRespone.success(userAscriptionService.getById(id));
-    }
-
-    /**
-     * 新增
-     *
-     * @param parentUserId
-     * @param userIds
-     * @return ResultRespone
-     */
-    @ApiOperation(value = "新增(可重复绑定)")
-    @PostMapping("/save")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "parentUserId", value = "父级id", required = true, dataType = "Long"),
-            @ApiImplicitParam(name = "userIds", value = "用户id,多个以,分隔", required = true, dataType = "String")
-    })
-    public ResultRespone save(Long parentUserId, String userIds) {
-        List<Long> userIdList = Arrays.stream(userIds.split(Constant.CSV)).map(s -> Long.parseLong(s.trim()))
-                .collect(Collectors.toList());
-        userIdList.forEach(info -> {
-            UserAscription userAscription = new UserAscription();
-            userAscription.setParentUserId(parentUserId);
-            userAscription.setUserId(info);
-            userAscriptionService.save(userAscription);
-        });
-        return ResultRespone.success();
-    }
-
-    @ApiOperation(value = "通过父级id,用户id批量删除,绑定关系")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "parentUserId", value = "父级id", required = true, dataType = "Long"),
-            @ApiImplicitParam(name = "userIds", value = "用户id,多个以,分隔", required = true, dataType = "String")
-    })
-    @DeleteMapping("/deleteByUserIds")
-    public ResultRespone deleteByUserIds(Long parentUserId,String userIds) {
-        List<Long> userIdList = Arrays.stream(userIds.split(Constant.CSV)).map(s -> Long.parseLong(s.trim()))
-                .collect(Collectors.toList());
-        // 查询当前该用户列表中是否存绑定关系 存在则删除
-        List<UserAscription> list = userAscriptionService.list(new QueryWrapper<UserAscription>().lambda()
-                .eq(UserAscription::getParentUserId,parentUserId)
-                .in(UserAscription::getUserId, userIdList));
-        if (null != list && list.size() > 0) {
-            userAscriptionService.removeByIds(list.stream().map(UserAscription::getId).collect(Collectors.toList()));
-        }
-        return ResultRespone.success();
-    }
-
-    /**
-     * 通过id批量删除
-     *
-     * @param ids id
-     * @return ResultRespone
-     */
-
-    @ApiOperation(value = "通过ID批量删除")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "批量删除，多个id以逗号隔开", required = true, dataType = "String")
-    })
-    @DeleteMapping("/deleteByIds")
-    public ResultRespone removeById(String ids) {
-        return ResultRespone.success(userAscriptionService.removeByIds(Arrays.asList(ids.split(","))));
-    }
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/UserMiddleController.java

@@ -1,65 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import com.tofly.base.entity.User;
-import com.tofly.base.entity.UserRoles;
-import com.tofly.base.service.UserService;
-import com.tofly.common.core.entity.ResultRespone;
-
-import com.tofly.base.entity.UserMiddle;
-import com.tofly.base.service.UserMiddleService;
-
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import org.springframework.web.bind.annotation.ModelAttribute;
-
-import java.util.Arrays;
-
-/**
- * 用户中间表
- *
- * @author admin
- * @date Thu Mar 03 00:00:00 CST 2022
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/usermiddle")
-@Api(tags = "用户中间表接口")
-@Slf4j
-public class UserMiddleController {
-    private final UserMiddleService userMiddleService;
-    private final UserService userService;
-
-    /**
-     * 分页查询
-     *
-     * @param page       分页对象
-     * @param userMiddle 用户中间表
-     * @return
-     */
-    @GetMapping("/page")
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getUserMiddlePage(Page page, @ModelAttribute UserMiddle userMiddle) {
-        return ResultRespone.success(userMiddleService.page(page, Wrappers.query(userMiddle)));
-    }
-
-    @PostMapping("/sendUserNewUpdate")
-    public ResultRespone sendUserNewUpdate(@RequestBody UserRoles user){
-        log.info("营销用户同步:{}",user.getRealName());
-        return ResultRespone.success(userMiddleService.sendUserNewUpdate(user));
-    }
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/UserRoleController.java

@@ -1,162 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.entity.User;
-import com.tofly.base.entity.UserRole;
-import com.tofly.base.service.UserRoleService;
-import com.tofly.base.service.UserService;
-import com.tofly.common.core.constant.CommonConstants;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import com.tofly.common.oauth.util.SecurityUtils;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import java.util.Map;
-
-/**
- * 用户角色表
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/userrole")
-//@ApiIgnore
-//@Api(tags="用户角色接口")
-public class UserRoleController {
-
-    private final  UserRoleService userRoleService;
-    @Autowired
-    private UserService userService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param userRole 用户角色表
-    * @return
-    */
-    @GetMapping("/page" )
-    //@ApiOperation(value = "分页查询")
-    public ResultRespone getUserRolePage(Page page, @ModelAttribute UserRole userRole) {
-      return ResultRespone.success(userRoleService.page(page, Wrappers.query(userRole)));
-    }
-
-
-    /**
-     * 通过id查询用户角色表
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    //@ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(userRoleService.getById(id));
-    }
-
-    /**
-     * 新增用户角色表
-     * @param userRole 用户角色表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增用户角色" )
-    @ApiOperation(tags = {"用户管理","角色管理"},value = "新增用户角色")
-    @PostMapping
-    public ResultRespone save(@RequestBody UserRole userRole) {
-      return ResultRespone.success(userRoleService.save(userRole));
-    }
-
-   /* *//**
-     * 修改用户角色表
-     * @param userRole 用户角色表
-     * @return ResultRespone
-     *//*
-    @ToFlyAppLog(title="修改用户角色表" )
-    //@ApiOperation(value = "修改用户角色表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody UserRole userRole) {
-      return ResultRespone.success(userRoleService.updateById(userRole));
-    }*/
-
-    /**
-     * 通过id删除用户角色表
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除用户角色表" )
-    //@ApiOperation(value = "通过ID删除用户角色表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-      return ResultRespone.success(userRoleService.removeById(id));
-    }
-
-    /**
-     * 修改用户角色表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改用户角色" )
-    @ApiOperation(tags = {"用户管理","角色管理"},value = "新增、修改用户角色")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "userids", value = "用户ID列表 多个以,分隔", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "roles", value = "用户角色，多个使用逗号(,)隔开",  dataType = "String")
-    })
-    @PutMapping
-    public ResultRespone updateById(@ApiParam(hidden = true) @RequestBody Map map) {
-//        if(checkHandler(Long.parseLong((String)map.get("userid")))){
-//            return ResultRespone.failed("当前用户不能修改其他人创建的用户");
-//        }
-//        else {
-         // 允许用户修改其他用户
-        String userids = (String) map.get("userids");
-
-        String[] role = userids.split(",");
-        for(String userId: role){
-            userRoleService.updateUserRole(Long.valueOf(userId), (String) map.get("roles"));
-        }
-            return ResultRespone.success();
-//        }
-    }
-
-    private boolean checkHandler(Long userid){
-
-        if(CommonConstants.SUPER_ADMIN_ULEVEL.equals(SecurityUtils.getUser().getUserLevel())){
-            return false;
-        }
-        if(SecurityUtils.getUserId().equals(userid)){
-            return false;
-        }
-
-        User user=userService.getById(userid);
-
-        if(SecurityUtils.getUserId().equals(user.getCreateUser())){
-            return false;
-        }else {
-            if(CommonConstants.SUPER_ADMIN_ULEVEL.equals(user.getUserLevel())){
-                return true;
-            }else {
-                return checkHandler(user.getCreateUser());
-            }
-        }
-
-
-    }
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/UserpermissionController.java

@@ -1,98 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.entity.Userpermission;
-import com.tofly.base.service.UserpermissionService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 用户许可表
- *
- * @author admin
- * @date Thu Oct 10 00:00:00 CST 2019
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/userpermission")
-@Api(tags="用户许可表接口")
-public class UserpermissionController {
-
-    private final  UserpermissionService userpermissionService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param userpermission 用户许可表
-    * @return
-    */
-    @GetMapping("/page" )
-    //@ApiOperation(value = "分页查询")
-    public ResultRespone getUserpermissionPage(Page page, @ModelAttribute Userpermission userpermission) {
-      return ResultRespone.success(userpermissionService.page(page, Wrappers.query(userpermission)));
-    }
-
-
-    /**
-     * 通过id查询用户许可表
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    //@ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(userpermissionService.getById(id));
-    }
-
-    /**
-     * 新增用户许可表
-     * @param userpermission 用户许可表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增用户许可表" )
-    //@ApiOperation(value = "新增用户许可表")
-    @PostMapping
-    public ResultRespone save(@RequestBody Userpermission userpermission) {
-      return ResultRespone.success(userpermissionService.save(userpermission));
-    }
-
-    /**
-     * 修改用户许可表
-     * @param userpermission 用户许可表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改用户许可表" )
-    //@ApiOperation(value = "修改用户许可表")
-    @PutMapping
-    public ResultRespone updateById(@RequestBody Userpermission userpermission) {
-      return ResultRespone.success(userpermissionService.updateById(userpermission));
-    }
-
-    /**
-     * 通过id删除用户许可表
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除用户许可表" )
-    //@ApiOperation(value = "通过ID删除用户许可表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-      return ResultRespone.success(userpermissionService.removeById(id));
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/message/MessagepushController.java

@@ -1,118 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller.message;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.entity.dto.MessagepushDto;
-import com.tofly.base.service.messge.MessagepushService;
-import com.tofly.base.service.messge.MessagerecipientService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-
-import com.tofly.pojo.message.Messagepush;
-import com.tofly.pojo.message.Messagerecipient;
-import lombok.AllArgsConstructor;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import org.springframework.web.bind.annotation.ModelAttribute;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 消息推送数据表:TF_YWPN_MESSAGEPUSH_W
- *
- * @author admin
- * @date Wed Mar 31 00:00:00 CST 2021
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/messagepush")
-@Api(tags="消息推送数据接口")
-public class MessagepushController {
-
-    private final MessagepushService messagepushService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param dto 消息推送数据表:TF_YWPN_MESSAGEPUSH_W
-    * @return
-    */
-    @GetMapping("/page" )
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getMessagepushPage(Page page, @ModelAttribute MessagepushDto dto) {
-      return ResultRespone.success(messagepushService.getPageInfo(page, dto));
-    }
-
-
-    /**
-     * 通过id查询消息推送数据表:TF_YWPN_MESSAGEPUSH_W
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(messagepushService.getById(id));
-    }
-
-    /**
-     * 新增消息推送数据表:TF_YWPN_MESSAGEPUSH_W
-     * @param messagepush 消息推送数据表:TF_YWPN_MESSAGEPUSH_W
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增消息推送数据表:TF_YWPN_MESSAGEPUSH_W" )
-    @ApiOperation(value = "新增消息推送数据表:TF_YWPN_MESSAGEPUSH_W")
-    @PostMapping("/save")
-    public ResultRespone<Long> save(@RequestBody Messagepush messagepush) {
-        boolean save = messagepushService.save(messagepush);
-        if(save){
-            return ResultRespone.success(messagepush.getId());
-        }else {
-            return ResultRespone.failed(null);
-        }
-
-    }
-
-    /**
-     * 修改消息推送数据表:TF_YWPN_MESSAGEPUSH_W
-     * @param messagepush 消息推送数据表:TF_YWPN_MESSAGEPUSH_W
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改消息推送数据表:TF_YWPN_MESSAGEPUSH_W" )
-    @ApiOperation(value = "修改消息推送数据表:TF_YWPN_MESSAGEPUSH_W")
-    @PutMapping("/updata")
-    public ResultRespone updateById(@RequestBody Messagepush messagepush) {
-      return ResultRespone.success(messagepushService.updateById(messagepush));
-    }
-
-    /**
-     * 通过id批量删除消息推送数据表:TF_YWPN_MESSAGEPUSH_W
-     * @param ids id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id批量删除消息推送数据表:TF_YWPN_MESSAGEPUSH_W" )
-    @ApiOperation(value = "通过ID批量删除消息推送数据表:TF_YWPN_MESSAGEPUSH_W")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "批量删除，多个id以逗号隔开", required = true, dataType = "String")
-    })
-    @DeleteMapping("/deleteByIds" )
-    public ResultRespone removeById(String ids) {
-        return ResultRespone.success(messagepushService.removeByIds(Arrays.asList(ids.split(","))));
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/message/MessagerecipientController.java

@@ -1,126 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller.message;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.service.messge.MessagerecipientService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import com.tofly.pojo.message.Messagerecipient;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import org.springframework.web.bind.annotation.ModelAttribute;
-
-import java.util.Arrays;
-/**
- * 接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W
- *
- * @author admin
- * @date Wed Mar 31 00:00:00 CST 2021
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/messagerecipient")
-@Api(tags="接收人接收消息数据接口")
-public class MessagerecipientController {
-
-    private final MessagerecipientService messagerecipientService;
-
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param messagerecipient 接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W
-    * @return
-    */
-    @GetMapping("/page" )
-    @ApiOperation(value = "分页查询")
-    public ResultRespone getMessagerecipientPage(Page page, @ModelAttribute Messagerecipient messagerecipient) {
-      return ResultRespone.success(messagerecipientService.page(page, Wrappers.query(messagerecipient)));
-    }
-
-
-    /**
-     * 通过id查询接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone<Messagerecipient> getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(messagerecipientService.getById(id));
-    }
-
-    /**
-     * 新增接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W
-     * @param messagerecipient 接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W" )
-    @ApiOperation(value = "新增接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W")
-    @PostMapping("/save")
-    public ResultRespone<Boolean> save(@RequestBody Messagerecipient messagerecipient) {
-      return ResultRespone.success(messagerecipientService.save(messagerecipient));
-    }
-
-    /**
-     * 修改接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W
-     * @param messagerecipient 接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W" )
-    @ApiOperation(value = "修改接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W")
-    @PutMapping("/updata")
-    public ResultRespone<Boolean> updateById(@RequestBody Messagerecipient messagerecipient) {
-      return ResultRespone.success(messagerecipientService.update(messagerecipient,new QueryWrapper<Messagerecipient>().lambda().eq(Messagerecipient::getMessageId,messagerecipient.getMessageId())));
-    }
-
-    /**
-     * 通过id删除接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W" )
-    @ApiOperation(value = "通过ID删除接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-      return ResultRespone.success(messagerecipientService.removeById(id));
-    }
-
-    /**
-     * 通过id批量删除接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W
-     * @param ids id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id批量删除接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W" )
-    @ApiOperation(value = "通过ID批量删除接收人接收消息数据表：TF_YW_MESSAGERECIPIENT_W")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "批量删除，多个id以逗号隔开", required = true, dataType = "String")
-    })
-    @DeleteMapping("/deleteByIds" )
-    public ResultRespone removeById(String ids) {
-        return ResultRespone.success(messagerecipientService.removeByIds(Arrays.asList(ids.split(","))));
-    }
-
-    @ApiOperation(value = "批量修改对应消息信息的接收状态为已读")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "messageIds", value = "消息对象ID，多个id以逗号隔开", required = true, dataType = "String")
-    })
-    @GetMapping("/updateBatchMessageFlag")
-    public ResultRespone<Boolean> updateBatchMessageFlag(String messageIds) {
-        return ResultRespone.success(messagerecipientService.updateBatchMessageFlag(messageIds));
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/controller/message/UsertaskController.java

@@ -1,138 +0,0 @@
-/*
- * Author: wangjian
- * 生成controller
- */
-package com.tofly.base.controller.message;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.tofly.base.handler.task.UserTaskStateHandler;
-import com.tofly.base.service.messge.UsertaskService;
-import com.tofly.common.core.entity.ResultRespone;
-import com.tofly.common.log.annotation.ToFlyAppLog;
-import com.tofly.pojo.message.Usertask;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import org.springframework.web.bind.annotation.ModelAttribute;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 待办任务信息表
- *
- * @author admin
- * @date Wed Mar 31 00:00:00 CST 2021
- */
-@RestController
-@AllArgsConstructor
-@RequestMapping("/usertask")
-@Api(tags="待办任务信息表接口")
-public class UsertaskController {
-
-    private final UsertaskService usertaskService;
-    private final UserTaskStateHandler taskStateHandler;
-    /**
-    * 分页查询
-    * @param page 分页对象
-    * @param usertask 待办任务信息表
-    * @return
-    */
-    @GetMapping("/page" )
-    @ApiOperation(value = "分页查询")
-    public ResultRespone<Page<Usertask>> getUsertaskPage(Page page, @ModelAttribute Usertask usertask) {
-      return ResultRespone.success(usertaskService.getUserTaskPage(page, usertask));
-    }
-
-
-    /**
-     * 通过id查询待办任务信息表
-     * @param id id
-     * @return ResultRespone
-     */
-    @GetMapping("/{id}" )
-    @ApiOperation(value = "通过ID查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    public ResultRespone<Usertask> getById(@PathVariable("id" ) Long id) {
-      return ResultRespone.success(usertaskService.getById(id));
-    }
-
-    /**
-     * 新增待办任务信息表
-     * @param usertask 待办任务信息表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="新增待办任务信息表" )
-    @ApiOperation(value = "新增待办任务信息表")
-    @PostMapping("/save")
-    public ResultRespone<Boolean> save(@RequestBody Usertask usertask) {
-      return ResultRespone.success(usertaskService.save(usertask));
-    }
-
-    /**
-     * 修改待办任务信息表
-     * @param usertask 待办任务信息表
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="修改待办任务信息表" )
-    @ApiOperation(value = "修改待办任务信息表")
-    @PutMapping("/updata")
-    public ResultRespone<Boolean> updateById(@RequestBody Usertask usertask) {
-      return ResultRespone.success(usertaskService.updateById(usertask));
-    }
-
-    /**
-     * 通过id删除待办任务信息表
-     * @param id id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id删除待办任务信息表" )
-    @ApiOperation(value = "通过ID删除待办任务信息表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Long")
-    })
-    @DeleteMapping("/{id}" )
-    public ResultRespone removeById(@PathVariable Long id) {
-      return ResultRespone.success(usertaskService.removeById(id));
-    }
-
-    /**
-     * 通过id批量删除待办任务信息表
-     * @param ids id
-     * @return ResultRespone
-     */
-    @ToFlyAppLog(title="通过id批量删除待办任务信息表" )
-    @ApiOperation(value = "通过ID批量删除待办任务信息表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "ids", value = "批量删除，多个id以逗号隔开", required = true, dataType = "String")
-    })
-    @DeleteMapping("/deleteByIds" )
-    public ResultRespone removeById(String ids) {
-        return ResultRespone.success(usertaskService.removeByIds(Arrays.asList(ids.split(","))));
-    }
-
-    /**
-     * 根据传入对象查询待办事项信息
-     * @param usertask 待办任务信息
-     * @return
-     */
-    @PostMapping("/getUserTaskInfo" )
-    @ApiOperation(value = "根据传入对象查询待办事项信息")
-    public ResultRespone<List<Usertask>> getUserTaskInfo(@RequestBody Usertask usertask) {
-        return ResultRespone.success(usertaskService.list(new QueryWrapper<>(usertask)));
-    }
-    @PostMapping("/test" )
-    @ApiOperation(value = "测试userTaskStateHandler")
-    public ResultRespone<Object> userTaskStateHandler() {
-        taskStateHandler.userTaskStateHandler("");
-        return ResultRespone.success();
-    }
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/dto/AppTypeDTO.java

@@ -1,26 +0,0 @@
-package com.tofly.base.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @author fcl
- * @date 2021/3/10 14:02
- */
-@Data
-public class AppTypeDTO {
-    @ApiModelProperty(value = "APP类型")
-    private String version;
-
-    @ApiModelProperty(value = "发布状态")
-    private String releaStatu;
-
-    @ApiModelProperty(value = "发布时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date releaseTime;
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/dto/ApplyForReviewDTO.java

@@ -1,13 +0,0 @@
-package com.tofly.base.dto;
-
-import com.tofly.base.entity.User;
-import lombok.Data;
-
-/**
- * @author fcl
- * @date 2021/3/16 15:25
- */
-@Data
-public class ApplyForReviewDTO extends User {
-    private String roles;
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/dto/CompanyDeptDto.java

@@ -1,22 +0,0 @@
-package com.tofly.base.dto;
-
-import com.tofly.base.entity.Company;
-import com.tofly.base.entity.Department;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class CompanyDeptDto implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "新增类型,1 为单位,2为部门",required = true)
-    private String type;
-
-    @ApiModelProperty(value = "单位对象")
-    private Company company;
-
-    @ApiModelProperty(value = "部门对象")
-    private Department department;
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/dto/DepartmentSouceDTO.java

@@ -1,20 +0,0 @@
-package com.tofly.base.dto;
-
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author fcl
- * @date 2021/3/12 10:48
- */
-@Data
-public class DepartmentSouceDTO {
-    @ApiModelProperty(value = "部门ID")
-    private Long departmentId;
-    @ApiModelProperty(value = "资源ID")
-    private Long sourceId;
-    @ApiModelProperty(value = "用户ID")
-    private Long userId;
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/dto/ExcleSourceDTO.java

@@ -1,38 +0,0 @@
-package com.tofly.base.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author fcl
- * @date 2021/4/1 16:17
- */
-@Data
-@ApiModel
-public class ExcleSourceDTO {
-
-    /**
-     * 上级单位/部门全称
-     */
-    @ApiModelProperty(value = "上级单位/部门全称")
-    private String parentName;
-
-    /**
-     * 单位/部门简称
-     */
-    @ApiModelProperty(value = "单位/部门简称")
-    private String shortName;
-
-    /**
-     * 单位/部门全称
-     */
-    @ApiModelProperty(value = "单位/部门全称")
-    private String name;
-
-    /**
-     * 单位/部门编码
-     */
-    @ApiModelProperty(value = "单位/部门编码")
-    private String code;
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/dto/HistorySelectDTO.java

@@ -1,27 +0,0 @@
-package com.tofly.base.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-@Data
-public class HistorySelectDTO {
-    @ApiModelProperty(value = "用户名")
-    private String username;
-
-    @ApiModelProperty(value = "审核意见")
-    private String auditStatus;
-
-    @ApiModelProperty(value = "开始申请时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date startAuditTime;
-
-    @ApiModelProperty(value = "结束申请时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date endAuditTime;
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/dto/ResetUserDTO.java

@@ -1,18 +0,0 @@
-package com.tofly.base.dto;
-
-import com.tofly.base.entity.User;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author fcl
- * @date 2021/3/13 11:02
- */
-@Data
-public class ResetUserDTO {
-    @ApiModelProperty(value = "多个用户")
-    List<User> users;
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/dto/RoleMenuDTO.java

@@ -1,15 +0,0 @@
-package com.tofly.base.dto;
-
-import com.tofly.base.entity.Role;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author fcl
- * @date 2021/4/8 13:11
- */
-@Data
-public class RoleMenuDTO extends Role {
-    @ApiModelProperty(value = "通过ID拼接的字符串,以逗号隔开.如,'1,2,3,4,5,6,7")
-    private String menuIds;
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/dto/SorceTreeDTO.java

@@ -1,18 +0,0 @@
-package com.tofly.base.dto;
-
-import com.tofly.base.entity.Source;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author fcl
- * @date 2021/3/20 11:21
- */
-@Data
-@ApiModel
-public class SorceTreeDTO extends Source {
-    List<SorceTreeDTO> list;
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/dto/UserDTO.java

@@ -1,232 +0,0 @@
-package com.tofly.base.dto;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.tofly.common.core.annotation.Excel;
-import com.tofly.mybatisplus.config.ToflySqlCondition;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @author fcl
- * @date 2021/3/13 11:51
- */
-
-@ApiModel
-@Data
-public class UserDTO {
-
-    /**
-     * 用户名
-     */
-    @ApiModelProperty(value = "用户名")
-    @TableField(condition = ToflySqlCondition.LIKE)
-    @Excel(name = "username")
-    private String username;
-    /**
-     * 密码
-     */
-    @ApiModelProperty(value = "密码")
-    @Excel(name = "password")
-    private String password;
-    /**
-     * 随机数
-     */
-    @ApiModelProperty(value = "随机数")
-    private String salt;
-    /**
-     * 电话
-     */
-    @ApiModelProperty(value = "电话")
-    @Excel(name = "phone")
-    private String phone;
-    /**
-     * 头像
-     */
-    @ApiModelProperty(value = "头像")
-    private String avatar;
-    /**
-     * 部门ID
-     */
-    @ApiModelProperty(value = "部门ID")
-    @Excel(name = "departmentId")
-    private Long departmentId;
-
-    @TableField(exist = false)
-    private String departmentName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME",fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 修改时间
-     */
-    @ApiModelProperty(value = "修改时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "UPDATE_TIME",fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-    /**
-     * 是否锁定，1正常，0锁定
-     */
-    @ApiModelProperty(value = "是否锁定，1正常，0锁定")
-    private String lockFlag;
-    /**
-     * 是否启用禁用，1启用，0禁用
-     */
-    @ApiModelProperty(value = "是否启用禁用，1启用，0禁用")
-    private String statusFlag;
-    /**
-     * 扩展功能，微信openid
-     */
-    @ApiModelProperty(value = "扩展功能，微信openid")
-    private String wxOpenid;
-    /**
-     * 扩展功能，QQ openid
-     */
-    @ApiModelProperty(value = "扩展功能，QQ openid")
-    private String qqOpenid;
-    /**
-     * 用户email
-     */
-    @ApiModelProperty(value = "用户email")
-    @Excel(name = "email")
-    private String email;
-    /**
-     * 用户姓名
-     */
-    @ApiModelProperty(value = "用户姓名")
-    @TableField(condition = ToflySqlCondition.LIKE)
-    @Excel(name = "realName")
-    private String realName;
-    /**
-     * 最后一次登录时间
-     */
-    @ApiModelProperty(value = "最后一次登录时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date loginTime;
-    /**
-     * 最后一次访问IP
-     */
-    @ApiModelProperty(value = "最后一次访问IP")
-    private String lastIp;
-    /**
-     * 密码错误次数
-     */
-    @ApiModelProperty(value = "密码错误次数")
-    private Short pwderrtimes;
-    /**
-     * 工号
-     */
-    @ApiModelProperty(value = "工号")
-    private String worknumber;
-    /**
-     * 找回密码关键字
-     */
-    @ApiModelProperty(value = "找回密码关键字")
-    private String findpwdkey;
-    /**
-     * 别名
-     */
-    @ApiModelProperty(value = "别名")
-    private String aliasname;
-    /**
-     * 生日
-     */
-    @ApiModelProperty(value = "生日")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date birthday;
-    /**
-     * 属于（学院/部门）
-     */
-    @ApiModelProperty(value = "属于（学院/部门）")
-    private String belong;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER",fill = FieldFill.INSERT)
-    private Long createUser;
-
-    /**
-     * 用户级别
-     */
-    @ApiModelProperty(value = "用户级别")
-    @Excel(name = "userLevel")
-    private String userLevel;
-
-    /**
-     * 创建类型，0自建、1申请创建
-     */
-    @ApiModelProperty(value = "创建类型，0自建、1申请创建")
-    private String createType;
-
-    /**
-     * 首次登陆状态,1 首次登录,0 非首次登录
-     */
-    @ApiModelProperty(value = "首次登陆状态,1 首次登录,0 非首次登录")
-    private String firstLog;
-
-    /**
-     * 申请人
-     */
-    @ApiModelProperty(value = "申请人")
-    private String applyer;
-
-    /**
-     * 申请时间
-     */
-    @ApiModelProperty(value = "申请时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date applyTime;
-
-    /**
-     * 申请说明
-     */
-    @ApiModelProperty(value = "申请说明")
-    private String applyState;
-
-    /**
-     * 审核人
-     */
-    @ApiModelProperty(value = "审核人")
-    private String auditor;
-
-    /**
-     * 用户账号详情
-     */
-    @ApiModelProperty(value = "用户账号详情")
-    private String accountState;
-
-    /**
-     * 审核时间
-     */
-    @ApiModelProperty(value = "审核时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date auditTime;
-
-    /**
-     * 审核说明
-     */
-    @ApiModelProperty(value = "审核说明")
-    private String auditState;
-
-    /**
-     * 审核状态,1 未审核,2 同意, 0 不同意
-     */
-    @ApiModelProperty(value = "审核状态,1 未审核,2 同意, 0 不同意")
-    private String auditStatus;
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/em/Constant.java

@@ -1,36 +0,0 @@
-package com.tofly.base.em;
-
-/**
- * @author fcl
- * @date 2021/3/26 14:47
- */
-public class Constant {
-    /**
-     * 导入导出文件相关
-     */
-    public static String DEFAULT_REPORT_IMPORT_FOLDER = "/report/import";
-    public static String DEFAULT_REPORT_EXPORT_FOLDER = "/report/export";
-
-    /**
-     * 系统分隔符
-     */
-    public static String SYSTEM_SEPARATOR = "/";
-
-    /**
-     * 获取项目根目录
-     */
-    public static String PROJECT_ROOT_DIRECTORY = System.getProperty("user.dir").replaceAll("\\\\", SYSTEM_SEPARATOR);
-
-    /**
-     * excel导出测试临时存储路径
-     */
-    public static String FILE_PATH_TEST_EXPORT_EXCEL = PROJECT_ROOT_DIRECTORY + "/excel.xls";
-
-    public static String YES = "1";
-
-    public static String NO = "0";
-
-    public static String POINT = ".";
-
-    public static String CSV = ",";
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/em/CreateWayEM.java

@@ -1,19 +0,0 @@
-package com.tofly.base.em;
-
-public enum CreateWayEM {
-    /**
-            * 用户创建类型(自建)
- */
-    SELF_BUILT("0"),
-    APPLY("1"),
-    AGREE("2");
-    String type;
-
-    CreateWayEM(String type) {
-        this.type = type;
-    }
-
-    public String getType() {
-        return type;
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/em/ExcelExportFileTypeEnum.java

@@ -1,64 +0,0 @@
-package com.tofly.base.em;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.springframework.util.StringUtils;
-
-/**
- * @ClassName: ExcelExportFileTypeEnum
- * @Description: 导出文件枚举
- * @Author Zev
- * @Date 2021/3/25
- * @Version 1.0.0
- */
-@Getter
-@AllArgsConstructor
-public enum ExcelExportFileTypeEnum {
-    /**
-     *
-     */
-    EXPORT_USER_ADD("/批量账号创建模板.xlsx","批量账号创建","userService","0"),
-    EXPORT_DEPARTMENT_ADD("/批量单位组织创建模板.xlsx","批量单位组织创建模板","departmentService","0"),
-    EXPORT_USER_INFO("/userInfo.xlsx","用户导出模板","userService","1"),
-    EXPORT_OPERATION_DEPT_RECORD("/operationRecordDept.xlsx","部门操作记录","logService","0"),
-    EXPORT_OPERATION_USER_RECORD("/operationRecordUser.xlsx","人员操作记录","logService","1"),
-    ;
-    /**
-     * 导出模板文件
-     */
-    private String templateFile;
-    /**
-     * 导出表格名
-     */
-    private String sheetName;
-
-    /**
-     * 模板服务类型
-     */
-    private String templateServiceType;
-
-    /**
-     * 是否为示例模板
-     */
-    private String flag;
-
-    /**
-     * 根据模型类型和是否为示例模板获取对应枚举对象
-     *
-     * @param templateServiceType 模型类型
-     * @param flag                是否为示例模板
-     * @return 枚举对象
-     */
-    public static ExcelExportFileTypeEnum getExcelExportFileTypeEnum(String templateServiceType, String flag) {
-        if (StringUtils.isEmpty(templateServiceType)) {
-            return null;
-        }
-
-        for (ExcelExportFileTypeEnum e : ExcelExportFileTypeEnum.values()) {
-            if (e.templateServiceType.equalsIgnoreCase(templateServiceType) && e.flag.equalsIgnoreCase(flag)) {
-                return e;
-            }
-        }
-        return null;
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/em/ExcelImportFileTypeEnum.java

@@ -1,53 +0,0 @@
-package com.tofly.base.em;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.springframework.util.StringUtils;
-
-/**
- * @ClassName: ExcelExportFileTypeEnum
- * @Description: 导入文件枚举
- * @Author Zev
- * @Date 2021/3/25
- * @Version 1.0.0
- */
-@Getter
-@AllArgsConstructor
-public enum ExcelImportFileTypeEnum {
-
-    IMPORT_GOVERN_POINT_INFO_XML("/userService.xml", "userService", "批量账号创建"),
-    ;
-    /**
-     * 导入映射文件XML
-     */
-    private String mappingXml;
-
-    /**
-     * 模板服务类型
-     */
-    private String templateServiceType;
-
-    /**
-     * 说明
-     */
-    private String msg;
-
-    /**
-     * 根据模型类型和是否为示例模板获取对应枚举对象
-     *
-     * @param templateServiceType 模型类型
-     * @return 枚举对象
-     */
-    public static ExcelImportFileTypeEnum getExcelImportFileTypeEnum(String templateServiceType) {
-        if (StringUtils.isEmpty(templateServiceType)) {
-            return null;
-        }
-
-        for (ExcelImportFileTypeEnum e : ExcelImportFileTypeEnum.values()) {
-            if (e.templateServiceType.equalsIgnoreCase(templateServiceType)) {
-                return e;
-            }
-        }
-        return null;
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/em/IsHandlerEnum.java

@@ -1,47 +0,0 @@
-package com.tofly.base.em;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.springframework.util.StringUtils;
-
-/**
- * 是否进入工地管理
- * @author Zev
- */
-@Getter
-@AllArgsConstructor
-public enum IsHandlerEnum {
-    /**
-     *
-     */
-    IS_HANDLER_PENDING("0","待完成"),
-    IS_HANDLER_COMPLETED("1","已完成 "),
-    IS_HANDLER_NOT_STARTED("2","未开始"),
-    IS_HANDLER_TIMEOUT("3","已超时"),
-    IS_HANDLER_TIMEOUT_EXPIRED("4","已超时待完成")
-
-    ;
-    /**
-     * 编码
-     */
-    private String code;
-    /**
-     * 内容
-     */
-    private String value;
-
-    public static String getCodeForValue(String code) {
-        String path = "";
-        if (StringUtils.isEmpty(code)) {
-            return path;
-        }
-
-        for (IsHandlerEnum e : IsHandlerEnum.values()) {
-            if (e.code.equalsIgnoreCase(code)) {
-                path = e.value;
-                break;
-            }
-        }
-        return path;
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/em/PasswordEM.java

@@ -1,18 +0,0 @@
-package com.tofly.base.em;
-
-public enum PasswordEM {
-    /**
-     * 重置密码
-     */
-    RSA_RESETPASSWORD("hPAA33SGWef0jAoGuHxnJgNEbbj2mUhQZYjsgToZwmbpm/JfFl2GeSloyd2587qtqci6Y5f807tkGrVZ0TJMNmHi8A/vR1KLe+HVzEJ1y3U+o8dcs8OPBSDosnqaobgvJNRh4Q0ItjiANmoIW9lbDPNxLHtO9631sq4hLomNz9w="),
-    RESETPASSWORD("000000");
-    String type;
-
-    PasswordEM(String type) {
-        this.type = type;
-    }
-
-    public String getType() {
-        return type;
-    }
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/em/ZscbMessage.java

@@ -1,44 +0,0 @@
-package com.tofly.base.em;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * 制水成本消息提示
- * @author FlashWJL
- * @date 2021/5/31 16:08
- */
-@Getter
-@AllArgsConstructor
-public enum ZscbMessage {
-
-    MONTH_PRICE("每月实际单价调整", "实际单价调整", "111116", "TF_YWPN_COSTBGPRICE_W", "608"),
-    DAY_POD_WATER("每日填报实际用水量","实际用水量","111117","TF_YWPN_COSTRLWATER_W","607"),
-    FINANCE_MONTH("每月财务填报","进行财务填报","111119","TF_YWPN_COSTRLFIXED_W","610"),
-    MIN_FLOW_WARN("夜间最小流量异常通知","夜间最小流量异常","111121","TF_YWPN_DMANIGHTFLOW_W","3608"),
-    SHOULD_ZJ_METER("需要周检水表个数：","到期水表进行周检操作","111120","TF_YWPN_QFKHJBXX_W","117"),
-    ;
-
-    /**
-     * 消息主题
-     */
-    private String topic;
-    /**
-     * 消息详情
-     */
-    private String message;
-    /**
-     * 消息类型：0普通消息 1抢维修 2巡检 3工地 4隐患 5管网工单  6业务工单 7基础数据处理 0001上报 0002审核
-     */
-    private String type;
-    /**
-     * 消息链接表名
-     */
-    private String tableName;
-    /**
-     * 菜单ID
-     */
-    private String menuId;
-
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/App.java

@@ -1,127 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-
-/**
- * ${comments}
- *
- * @author fcl
- * @date Wed Mar 10 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value="TF_SMPN_APP_X",resultMap = "appMap")
-@KeySequence("TF_SMPN_APP_X")
-@ApiModel
-public class App extends Model<App> {
-    private static final long serialVersionUID = 1L;
-
-        /**
-     * $column.comments
-     */
-        @TableId(value = "ID",type= IdType.INPUT)
-            @ApiModelProperty(value = "$column.comments")
-                private Long id;
-                /**
-     * 版本号
-     */
-            @ApiModelProperty(value = "版本号")
-                private String version;
-                /**
-     * APP原名称
-     */
-            @ApiModelProperty(value = "APP原名称")
-                private String filename;
-                /**
-     * APP上传后名称
-     */
-            @ApiModelProperty(value = "APP上传后名称")
-                private String othername;
-                /**
-     * $column.comments
-     */
-            @ApiModelProperty(value = "$column.comments")
-                private String appPath;
-                /**
-     * 版本说明
-     */
-            @ApiModelProperty(value = "版本说明")
-                private String versionstate;
-                /**
-     * 排序号
-     */
-            @ApiModelProperty(value = "排序号")
-                private Long sort;
-                /**
-     * $column.comments
-     */
-            @ApiModelProperty(value = "$column.comments")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            @TableField(value = "CREATE_TIME",fill = FieldFill.INSERT)
-            private Date createTime;
-                /**
-     * 创建人
-     */
-            @ApiModelProperty(value = "创建人")
-            @TableField(value = "CREATE_USER",fill = FieldFill.INSERT)
-            private Long createUser;
-
-            /**
-     * 发布时间
-     */
-            @ApiModelProperty(value = "发布时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-                private Date releasetime;
-                /**
-     * 发布人
-     */
-            @ApiModelProperty(value = "发布人")
-                private Long releaser;
-            @TableField(exist = false)
-            @ApiModelProperty(hidden = true,value = "发布人名称")
-            private String releaserName;
-                /**
-     * 发布状态,1 未发布, 2 已发布
-     */
-            @ApiModelProperty(value = "发布状态,1 未发布, 2 已发布")
-                private String releasestatus;
-
-    /**
-     * 类型：1 一体化采集；2  综合业务
-     */
-    @ApiModelProperty(value = "类型：1 一体化采集；2  综合业务")
-    private String appType;
-
-    /**
-     * App大小
-     */
-    @ApiModelProperty(value = "App大小")
-    private String appSize;
-    /**
-     * 用户名
-     */
-    @ApiModelProperty(value = "用户名")
-    private String createUserName;
-
-    /**
-     * 版本全称
-     */
-    @ApiModelProperty(value = "版本全称")
-    private String versionsub;
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/BaseRolesys.java

@@ -1,55 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * 
- *
- * @author wangjian
- * @date Mon Jun 22 00:00:00 CST 2020
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value="TF_BASE_ROLESYS",resultMap = "baseRolesysMap")
-@KeySequence("TF_BASE_ROLESYS")
-@ApiModel
-public class BaseRolesys extends Model<BaseRolesys> {
-    private static final long serialVersionUID = 1L;
-
-        /**
-     * 
-     */
-        @TableId(value = "id",type= IdType.INPUT)
-            @ApiModelProperty(value = "")
-                private Long id;
-                /**
-     * 角色id
-     */
-            @ApiModelProperty(value = "角色id")
-                private Long roleId;
-                /**
-     * 子系统id
-     */
-            @ApiModelProperty(value = "子系统id")
-                private String sysid;
-                /**
-     * 系统id
-     */
-            @ApiModelProperty(value = "系统id")
-                private String sysids;
-            
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/BaseSys.java

@@ -1,67 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-
-/**
- * @author wangjian
- * @date Tue Jul 07 00:00:00 CST 2020
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_SMPN_SYSTEM_X", resultMap = "baseSysMap")
-@KeySequence("TF_SMPN_SYSTEM_X")
-@ApiModel
-public class BaseSys extends Model<BaseSys> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 更新时间
-     */
-    @ApiModelProperty(value = "更新时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-    /**
-     *
-     */
-    @TableId(value = "id", type = IdType.INPUT)
-    @ApiModelProperty(value = "")
-    private Long id;
-    /**
-     * 子系统id
-     */
-    @ApiModelProperty(value = "子系统id")
-    private String sysid;
-    /**
-     * 子系统名称
-     */
-    @ApiModelProperty(value = "子系统名称")
-    private String sysname;
-
-    @ApiModelProperty(value = "子系统类型")
-    private String type;
-
-    @ApiModelProperty(value = "系统备注")
-    private String notes;
-
-    @ApiModelProperty(value = "路径")
-    private String path;
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/BaseSysmenu.java

@@ -1,92 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.KeySequence;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-
-/**
- * @author wangjian
- * @date Mon Jul 06 00:00:00 CST 2020
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_SMPN_SYSMENU", resultMap = "baseSysmenuMap")
-@KeySequence("TF_SMPN_SYSMENU")
-@ApiModel
-public class BaseSysmenu extends Model<BaseSysmenu> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String component;
-    /**
-     * 主键
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "主键")
-    private Long id;
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String label;
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String meta;
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String name;
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String parentPathid;
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String path;
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String pathId;
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String redirect;
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String sysid;
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String type;
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String widgetid;
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/Code.java

@@ -1,81 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.tofly.mybatisplus.config.ToflySqlCondition;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 系统码表
- *
- * @author wangjian
- * @date Mon Oct 21 00:00:00 CST 2019
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("TF_SMPN_CODE_X")
-@KeySequence("TF_SMPN_CODE_X")
-@ApiModel
-public class Code extends Model<Code> {
-    private static final long serialVersionUID = 1L;
-
-        /**
-     * 主键ID
-     */
-        @TableId(value = "ID",type= IdType.INPUT)
-        @ApiModelProperty(value = "主键ID")
-            private Long id;
-        /**
-     * 字段信息
-     */
-        @ApiModelProperty(value = "字段信息")
-            private String key;
-        /**
-     * 值信息
-     */
-        @ApiModelProperty(value = "值信息")
-        @TableField(condition = ToflySqlCondition.LIKE)
-            private String value;
-        /**
-     * 值说明描述
-     */
-        @ApiModelProperty(value = "值说明描述")
-        @TableField(condition = ToflySqlCondition.LIKE)
-            private String notes;
-        /**
-     * 级别  1字典类级别，2系统类级别
-     */
-        @ApiModelProperty(value = "级别  1字典类级别，2系统类级别")
-            private String ulevel;
-        /**
-     * 排序号
-     */
-        @ApiModelProperty(value = "排序号")
-            private Short sort;
-        /**
-     * 创建时间
-     */
-        @ApiModelProperty(value = "创建时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            @TableField(value = "CREATE_TIME",fill = FieldFill.INSERT)
-        private Date createTime;
-        /**
-     * 创建人
-     */
-        @ApiModelProperty(value = "创建人")
-            @TableField(value = "CREATE_USER",fill = FieldFill.INSERT)
-        private Long createUser;
-    
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/Company.java

@@ -1,106 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * 分公司信息表
- *
- * @author admin
- * @date Tue Jan 18 00:00:00 CST 2022
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_SMPN_COMPANY_X", resultMap = "companyMap")
-@KeySequence("TF_SMPN_COMPANY_X")
-@ApiModel
-public class Company extends Model<Company> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * $column.comments
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "$column.comments")
-    private Long id;
-    /**
-     * 分公司名称
-     */
-    @ApiModelProperty(value = "分公司名称")
-    private String companyName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 修改时间
-     */
-    @ApiModelProperty(value = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "UPDATE_TIME", fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-    /**
-     * 是否启用禁用 1启用 0禁用
-     */
-    @ApiModelProperty(value = "是否启用禁用 1启用 0禁用")
-    private String statusFlag;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @ApiModelProperty(hidden = true)
-    @TableField(exist = false)
-    private String createUserName;
-    /**
-     * 总公司id
-     */
-    @ApiModelProperty(value = "总公司id")
-    private Long parentId;
-
-    @ApiModelProperty(value = "编码")
-    private String coding;
-
-    @ApiModelProperty(value = "地址")
-    private String address;
-
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(value = "简称")
-    private String abbreviation;
-
-    @ApiModelProperty(value = "编码")
-    private String code;
-
-
-    @ApiModelProperty(hidden = true)
-    @TableField(exist = false)
-    private List<Company> subCompany;
-    @ApiModelProperty(hidden = true)
-    @TableField(exist = false)
-    private List<Department> deptVos;
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/Config.java

@@ -1,75 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.tofly.mybatisplus.config.ToflySqlCondition;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 系统配置信息表
- *
- * @author wangjian
- * @date Mon Oct 21 00:00:00 CST 2019
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("TF_SMPN_CONFIG_X")
-@KeySequence("TF_SMPN_CONFIG_X")
-@ApiModel
-public class Config extends Model<Config> {
-    private static final long serialVersionUID = 1L;
-
-        /**
-     * 唯一UUID
-     */
-        @TableId(value = "ID",type= IdType.INPUT)
-        @ApiModelProperty(value = "唯一UUID")
-            private Long id;
-        /**
-     * 默认值
-     */
-        @ApiModelProperty(value = "默认值")
-            private String defautValue;
-        /**
-     * 值信息
-     */
-        @ApiModelProperty(value = "值信息")
-            private String value;
-        /**
-     * 值说明描述
-     */
-        @ApiModelProperty(value = "值说明描述")
-        @TableField(condition = ToflySqlCondition.LIKE)
-            private String notes;
-        /**
-     * 创建时间
-     */
-        @ApiModelProperty(value = "创建时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            @TableField(value = "CREATE_TIME",fill = FieldFill.INSERT)
-        private Date createTime;
-        /**
-     * 创建人
-     */
-        @ApiModelProperty(value = "创建人")
-            @TableField(value = "CREATE_USER",fill = FieldFill.INSERT)
-        private Long createUser;
-        /**
-     * 字段信息
-     */
-        @ApiModelProperty(value = "字段信息")
-            private String key;
-    
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/Connection.java

@@ -1,67 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * 空间库连接配置信息表
- *
- * @author wangjian
- * @date Mon Oct 21 00:00:00 CST 2019
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("TF_SMPN_CONNECTION_X")
-@KeySequence("TF_SMPN_CONNECTION_X")
-@ApiModel
-public class Connection extends Model<Connection> {
-    private static final long serialVersionUID = 1L;
-
-        /**
-     * 编号
-     */
-        @TableId(value = "ID",type= IdType.INPUT)
-        @ApiModelProperty(value = "编号")
-            private Long id;
-        /**
-     * 数据库连接名称
-     */
-        @ApiModelProperty(value = "数据库连接名称")
-            private String name;
-        /**
-     * 连接类型，默认1 ORACLE数据库，2 SQL SERVER数据库
-     */
-        @ApiModelProperty(value = "连接类型，默认1 ORACLE数据库，2 SQL SERVER数据库")
-            private Short type;
-        /**
-     * 连接信息串
-     */
-        @ApiModelProperty(value = "连接信息串")
-            private String constr;
-        /**
-     * 创建时间
-     */
-        @ApiModelProperty(value = "创建时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            @TableField(value = "CREATE_TIME",fill = FieldFill.INSERT)
-        private Date createTime;
-        /**
-     * 创建用户
-     */
-        @ApiModelProperty(value = "创建用户")
-            @TableField(value = "CREATE_USER",fill = FieldFill.INSERT)
-        private Long createUser;
-    
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/CustomCode.java

@@ -1,15 +0,0 @@
-package com.tofly.base.entity;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author by Wangjieliu
- * @date 2021/3/18.
- */
-@Data
-public class CustomCode extends Syschildcode {
-    List<CustomCode> codeList=new ArrayList<>();
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/Department.java

@@ -1,115 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.tofly.mybatisplus.config.ToflySqlCondition;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 部门表
- *
- * @author wangjian
- * @date Mon Oct 21 00:00:00 CST 2019
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_SMPN_DEPARTMENT_X", resultMap = "departmentMap")
-@KeySequence("TF_SMPN_DEPARTMENT_X")
-@ApiModel
-public class Department extends Model<Department> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 部门ID，主键
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "部门ID，主键")
-    private Long id;
-    /**
-     * 部门名称
-     */
-    @ApiModelProperty(value = "部门名称")
-    @TableField(condition = ToflySqlCondition.LIKE)
-    private String name;
-    /**
-     * 排序号
-     */
-    @ApiModelProperty(value = "排序号")
-    private Integer sort;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 修改时间
-     */
-    @ApiModelProperty(value = "修改时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "UPDATE_TIME", fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-    /**
-     * 是否启用禁用 1启用 2禁用
-     */
-    @ApiModelProperty(value = "是否启用禁用 1启用 2禁用")
-    private String statusFlag;
-    /**
-     * 父级部门ID
-     */
-    @ApiModelProperty(value = "父级部门ID")
-    private Integer parentId;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-
-    @ApiModelProperty(value = "创建人",hidden = true)
-    private String userName;
-    /**
-     * 机构编码
-     */
-    @ApiModelProperty(value = "机构编码")
-    @TableField(condition = ToflySqlCondition.LIKE)
-    private String code;
-
-    @ApiModelProperty(value = "单位简称")
-    @TableField(condition = ToflySqlCondition.LIKE)
-    private String shortName;
-
-    @TableField(exist = false)
-    @ApiModelProperty(value = "父级部门")
-    private String parentName;
-
-    @ApiModelProperty(value = "标志")
-    private String statusName;
-
-    @ApiModelProperty(value = "公司id")
-    private Long companyId;
-    @ApiModelProperty(value = "公司名称")
-    @TableField(exist = false)
-    private String companyName;
-    @ApiModelProperty(value = "联系电话")
-    private String phone;
-
-    @ApiModelProperty(hidden = true)
-    @TableField(exist = false)
-    private List<Department> deptVos;
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/Departmentsource.java

@@ -1,63 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 单位资源配置关联信息表
- *
- * @author wangjian
- * @date Mon Oct 21 00:00:00 CST 2019
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("TF_SMPN_DEPARTMENTSOURCE_X")
-@KeySequence("TF_SMPN_DEPARTMENTSOURCE_X")
-@ApiModel
-public class Departmentsource extends Model<Departmentsource> {
-    private static final long serialVersionUID = 1L;
-
-        /**
-     * ID
-     */
-        @TableId(value = "ID",type= IdType.INPUT)
-        @ApiModelProperty(value = "ID")
-            private Long id;
-        /**
-     * 单位ID
-     */
-        @ApiModelProperty(value = "单位ID")
-            private Long departmentId;
-        /**
-     * 资源ID
-     */
-        @ApiModelProperty(value = "资源ID")
-            private Long sourceId;
-        /**
-     * 创建时间
-     */
-        @ApiModelProperty(value = "创建时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            @TableField(value = "CREATE_TIME",fill = FieldFill.INSERT)
-        private Date createTime;
-        /**
-     * 创建用户
-     */
-        @ApiModelProperty(value = "创建用户")
-        @TableField(value = "USER_ID",fill = FieldFill.INSERT)
-            private Long userId;
-    
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/Ftpfiles.java

@@ -1,107 +0,0 @@
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * @Author: 翘屁老猫
- * @Date: 2020/11/4 10:14
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value="TF_SMPN_FTPFILES_X",resultMap = "ftpfilesMap")
-@KeySequence("TF_SMPN_FTPFILES_X")
-@ApiModel
-public class Ftpfiles extends Model<Ftpfiles> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @TableId(value = "ID",type= IdType.INPUT)
-    @ApiModelProperty(value = "ID")
-    private Long id;
-    /**
-     * 关联表主键
-     */
-    @ApiModelProperty(value = "关联表主键")
-    private Long tableId;
-    /**
-     * 文件类型
-     */
-    @ApiModelProperty(value = "文件类型")
-    private String fileType;
-    /**
-     * 文件相对存放路径（FTP路径）
-     */
-    @ApiModelProperty(value = "文件相对存放路径（FTP路径）")
-    private String filePath;
-    /**
-     * 文件大小
-     */
-    @ApiModelProperty(value = "文件大小")
-    private Long fileLength;
-    /**
-     * 是否做FTP处理
-     */
-    @ApiModelProperty(value = "是否做FTP处理")
-    private String ftpState;
-    /**
-     * 应用名称
-     */
-    @ApiModelProperty(value = "应用名称")
-    private String appName;
-    /**
-     * 缩略图名称
-     */
-    @ApiModelProperty(value = "缩略图名称")
-    private String thumbName;
-    /**
-     * 缩略图路径
-     */
-    @ApiModelProperty(value = "缩略图路径")
-    private String thumbPath;
-    /**
-     * 原始名称
-     */
-    @ApiModelProperty(value = "原始名称")
-    private String originalName;
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value = "备注")
-    private String notes;
-    /**
-     * pdf文件路径
-     */
-    @ApiModelProperty(value = "pdf文件路径")
-    private String pdfPath;
-    /**
-     * PDF文件名称
-     */
-    @ApiModelProperty(value = "PDF文件名称")
-    private String pdfFileName;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME",fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 创建用户
-     */
-    @ApiModelProperty(value = "创建用户")
-    @TableField(value = "USER_ID",fill = FieldFill.INSERT)
-    private Long userId;
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/Log.java

@@ -1,131 +0,0 @@
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @Author: 翘屁老猫
- * @Date: 2020/11/4 10:19
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("TF_SMPN_LOG_X")
-@KeySequence("TF_SMPN_LOG_X")
-@ApiModel
-public class Log extends Model<Log> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 日志ID
-     */
-    @TableId(value = "ID",type= IdType.INPUT)
-    @ApiModelProperty(value = "日志ID")
-    private Long id;
-
-    /**
-     * 关联表名
-     */
-    @ApiModelProperty(value = "关联表名")
-    private String tableName;
-
-    /**
-     * 关联表名对应关键值ID
-     */
-    @ApiModelProperty(value = "关联表名对应关键值ID")
-    private String tableId;
-
-    /**
-     * 路由地址进行跳转
-     */
-    @ApiModelProperty(value = "路由地址进行跳转")
-    private String routeIp;
-    /**
-     * 日志类型
-     */
-    @ApiModelProperty(value = "日志类型")
-    private String type;
-    /**
-     * 服务ID
-     */
-    @ApiModelProperty(value = "服务ID")
-    private String serviceId;
-    /**
-     * 创建者
-     */
-    @ApiModelProperty(value = "创建者")
-    private String createBy;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME",fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 更新时间
-     */
-    @ApiModelProperty(value = "更新时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "UPDATE_TIME",fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-    /**
-     * 操作ip
-     */
-    @ApiModelProperty(value = "操作ip")
-    private String remoteAddr;
-    /**
-     * 用户代理
-     */
-    @ApiModelProperty(value = "用户代理")
-    private String userAgent;
-    /**
-     * 请求URI
-     */
-    @ApiModelProperty(value = "请求URI")
-    private String requestUri;
-    /**
-     * 操作方法
-     */
-    @ApiModelProperty(value = "操作方法")
-    private String method;
-    /**
-     * 操作提交数据
-     */
-    @ApiModelProperty(value = "操作提交数据")
-    private String params;
-    /**
-     * 相应时间
-     */
-    @ApiModelProperty(value = "响应时间")
-    private Long time;
-    /**
-     * 删除标记
-     */
-    @ApiModelProperty(value = "删除标记")
-    private String delFlag;
-    /**
-     * 异常信息
-     */
-    @ApiModelProperty(value = "异常信息")
-    private String exception;
-    /**
-     * 日志内容
-     */
-    @ApiModelProperty(value = "日志内容")
-    private String title;
-
-    @ApiModelProperty(value = "登录时长")
-    private BigDecimal operatingTime;
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/Menu.java

@@ -1,188 +0,0 @@
-/*
- * Author: fcl
- * 生成entity
- */
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.util.Date;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-
-
-/**
- * 菜单表
- *
- * @author fcl
- * @date Wed Mar 17 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value="TF_SMPN_MENU_X",resultMap = "menuMap")
-@KeySequence("TF_SMPN_MENU_X")
-@ApiModel
-public class Menu extends Model<Menu> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 菜单ID，主键
-     */
-    @TableId(value = "ID",type= IdType.INPUT)
-    @ApiModelProperty(value = "菜单ID，主键")
-    private Long id;
-    /**
-     * 菜单名称
-     */
-    @ApiModelProperty(value = "菜单名称")
-    private String name;
-    /**
-     * 菜单权限标识（保留字段）
-     */
-    @ApiModelProperty(value = "菜单权限标识（保留字段）")
-    private String permission;
-    /**
-     * 前端URL
-     */
-    @ApiModelProperty(value = "前端URL")
-    private String path;
-    /**
-     * 父菜单ID
-     */
-    @ApiModelProperty(value = "父菜单ID")
-    private Long parentId;
-    /**
-     * 默认图标
-     */
-    @ApiModelProperty(value = "默认图标")
-    private String icon;
-    /**
-     * 排序
-     */
-    @ApiModelProperty(value = "排序")
-    private Integer sort;
-    /**
-     * 开启关闭 1开启，0关闭
-     */
-    @ApiModelProperty(value = "开启关闭 1开启，0关闭")
-    private String keepAlive;
-    /**
-     * 菜单类型 0菜单 1功能 2工具 3按钮
-     */
-    @ApiModelProperty(value = "菜单类型 0菜单 1功能 2工具 3按钮")
-    private String type;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME",fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 修改时间
-     */
-    @ApiModelProperty(value = "修改时间")
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "UPDATE_TIME",fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-    /**
-     * 是否启用禁用 1启用，0禁用
-     */
-    @ApiModelProperty(value = "是否启用禁用 1启用，0禁用")
-    private String statusFlag;
-    /**
-     * 菜单编码（自定义菜单）
-     */
-    @ApiModelProperty(value = "菜单编码（自定义菜单）")
-    private String code;
-    /**
-     * 鼠标经过图标
-     */
-    @ApiModelProperty(value = "鼠标经过图标")
-    private String mouseIcon;
-    /**
-     * 是否放置在模板内  1放置在模板内，0不放置。
-     */
-    @ApiModelProperty(value = "是否放置在模板内  1放置在模板内，0不放置。")
-    private String inpanel;
-    /**
-     * 放置模板
-     */
-    @ApiModelProperty(value = "放置模板")
-    private String panel;
-    /**
-     * 是否跟随系统启动 1启动 2不启动
-     */
-    @ApiModelProperty(value = "是否跟随系统启动 1启动 2不启动")
-    private String autorun;
-    /**
-     * 所属子系统
-     */
-    @ApiModelProperty(value = "所属子系统")
-    private Long sysId;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER",fill = FieldFill.INSERT)
-    private Long createUser;
-    @TableField(exist = false)
-@ApiModelProperty(hidden = true)
-    private String createUserName;
-
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String component;
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String label;
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String meta;
-
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String parentPathid;
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String pathId;
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String redirect;
-
-    /**
-     *
-     */
-    @ApiModelProperty(value = "")
-    private String widgetid;
-
-    @ApiModelProperty(value = "层级")
-    @TableField(exist = false)
-    private Integer level;
-
-    @ApiModelProperty(value = "下级")
-    @TableField(exist = false)
-    private List<Menu> childrens;
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/MenuBatch.java

@@ -1,19 +0,0 @@
-package com.tofly.base.entity;
-
-import com.tofly.common.core.annotation.Excel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-
-/**
- * @author tuonbed
- * @date 2020/3/9  13:30
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class MenuBatch extends Menu implements Serializable {
-
-    @Excel(name="parentName")
-    private String parentName;
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/MenuChild.java

@@ -1,11 +0,0 @@
-package com.tofly.base.entity;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-public class MenuChild extends Menu{
-    private List<MenuChild> children=new ArrayList();
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/MySysMenu.java

@@ -1,15 +0,0 @@
-package com.tofly.base.entity;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author tuonbed
- * @date 2020/7/6  16:26
- */
-@Data
-public class MySysMenu extends BaseSysmenu{
-    private List<MySysMenu> children=new ArrayList();
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/Paramconfig.java

@@ -1,126 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * 参数配置信息表：TF_YWPN_PARAMCONFIG_W
- *
- * @author admin
- * @date Thu May 13 00:00:00 CST 2021
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_YWPN_PARAMCONFIG_W", resultMap = "paramconfigMap")
-@KeySequence("TF_YWPN_PARAMCONFIG_W")
-@ApiModel
-public class Paramconfig extends Model<Paramconfig> {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "ID", type = IdType.INPUT)
-    @ApiModelProperty(value = "主键ID")
-    private Long id;
-    /**
-     * 人巡最快速度（km/h）
-     */
-    @ApiModelProperty(value = "人巡最快速度（km/h）")
-    private Double peopleSpeed;
-    /**
-     * 人巡最大到位容差（m）
-     */
-    @ApiModelProperty(value = "人巡最大到位容差（m）")
-    private Double peopleMaxalw;
-    /**
-     * 车巡最快速度（km/h）
-     */
-    @ApiModelProperty(value = "车巡最快速度（km/h）")
-    private Double carSpeed;
-    /**
-     * 车巡最大到位容差（m）
-     */
-    @ApiModelProperty(value = "车巡最大到位容差（m）")
-    private Double carMaxalw;
-    /**
-     * 上传频率（秒/次）
-     */
-    @ApiModelProperty(value = "上传频率（秒/次）")
-    private Double uploadRate;
-    /**
-     * 轨迹最大速度（km/h）
-     */
-    @ApiModelProperty(value = "轨迹最大速度（km/h）")
-    private Double routeMaxspeed;
-    /**
-     * 手机拍摄上传照片是否添加时间水印,0不加，1加水印
-     */
-    @ApiModelProperty(value = "手机拍摄上传照片是否添加时间水印,0不加，1加水印")
-    private String ismark;
-    /**
-     * 人员轨迹颜色
-     */
-    @ApiModelProperty(value = "人员轨迹颜色")
-    private String plineColor;
-    /**
-     * 播放轨迹点颜色
-     */
-    @ApiModelProperty(value = "播放轨迹点颜色")
-    private String pointColor;
-    /**
-     * 播放轨迹线颜色
-     */
-    @ApiModelProperty(value = "播放轨迹线颜色")
-    private String lineColor;
-    /**
-     * 轨迹点细度（px）
-     */
-    @ApiModelProperty(value = "轨迹点细度（px）")
-    private Integer routePt;
-    /**
-     * 轨迹线细度（px）
-     */
-    @ApiModelProperty(value = "轨迹线细度（px）")
-    private Integer routeLine;
-    /**
-     * 轨迹分段点数（个）
-     */
-    @ApiModelProperty(value = "轨迹分段点数（个）")
-    private Integer routePtnum;
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value = "创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @TableField(value = "CREATE_TIME", fill = FieldFill.INSERT)
-    private Date createTime;
-    /**
-     * 创建人
-     */
-    @ApiModelProperty(value = "创建人")
-    @TableField(value = "CREATE_USER", fill = FieldFill.INSERT)
-    private Long createUser;
-    @TableField(exist = false)
-@ApiModelProperty(hidden = true)
-    private String createUserName;
-
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/Portaluser.java

@@ -1,80 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * 地图资源用户表
- *
- * @author wangjian
- * @date Mon Oct 21 00:00:00 CST 2019
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("TF_SMPN_PORTALUSER_X")
-@KeySequence("TF_SMPN_PORTALUSER_X")
-@ApiModel
-public class Portaluser extends Model<Portaluser> {
-    private static final long serialVersionUID = 1L;
-
-        /**
-     * ID
-     */
-        @TableId(value = "ID",type= IdType.INPUT)
-        @ApiModelProperty(value = "ID")
-            private Long id;
-        /**
-     * 用户名
-     */
-        @ApiModelProperty(value = "用户名")
-            private String userName;
-        /**
-     * 密码
-     */
-        @ApiModelProperty(value = "密码")
-            private String password;
-        /**
-     * 备注
-     */
-        @ApiModelProperty(value = "备注")
-            private String notes;
-        /**
-     * 创建时间
-     */
-        @ApiModelProperty(value = "创建时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            @TableField(value = "CREATE_TIME",fill = FieldFill.INSERT)
-        private Date createTime;
-        /**
-     * 修改时间
-     */
-        @ApiModelProperty(value = "修改时间")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-            @TableField(value = "UPDATE_TIME",fill = FieldFill.INSERT_UPDATE)
-        private Date updateTime;
-        /**
-     * 是否启用禁用 1启用 2禁用
-     */
-        @ApiModelProperty(value = "是否启用禁用 1启用 2禁用")
-            private String statusFlag;
-        /**
-     * 创建人
-     */
-        @ApiModelProperty(value = "创建人")
-            @TableField(value = "CREATE_USER",fill = FieldFill.INSERT)
-        private Long createUser;
-    
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/Position.java

@@ -1,91 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 职位表
- *
- * @author wangjian
- * @date Tue Dec 03 00:00:00 CST 2019
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "TF_SMPN_POSITION_X",resultMap = "positionMap")
-@KeySequence("TF_SMPN_POSITION_X")
-@ApiModel
-public class Position extends Model<Position> {
-    private static final long serialVersionUID = 1L;
-
-        /**
-     * 唯一ID
-     */
-        @TableId(value = "ID",type= IdType.INPUT)
-        @ApiModelProperty(value = "唯一ID")
-            private Long id;
-//        /**
-//     * 职位名称
-//     */
-//        @ApiModelProperty(value = "职位名称")
-//            private String name;
-        /**
-     * 职位类别， 1 一级审核，2 二级审核，3，三级审核， 9 普通员工
-     */
-        @ApiModelProperty(value = "职位类别")
-            private String category;
-//        /**
-//     * 是否部门负责人  0 不是，1是
-//     */
-//        @ApiModelProperty(value = "是否部门负责人  0 不是，1是")
-//            private String head;
-//        /**
-//     * 是否为部门审核人
-//     */
-//        @ApiModelProperty(value = "是否为部门审核人")
-//            private String deptaudit;
-        /**
-     * 部门ID
-     */
-        @ApiModelProperty(value = "部门ID")
-            private Long departmentId;
-        /**
-     * 用户ID
-     */
-        @ApiModelProperty(value = "用户ID")
-        private Long userId;
-
-        /**
-         * 创建人
-         */
-        @ApiModelProperty(value = "创建人")
-        @TableField(value = "CREATE_USER",fill = FieldFill.INSERT)
-        private Long createUser;
-
-        /**
-         * 创建日期
-         */
-        @ApiModelProperty(value = "创建日期")
-        @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-        @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-        @TableField(value = "CREATE_DATE",fill = FieldFill.INSERT)
-        private Date createDate;
-
-//        @TableField(exist = false)
-//        private Code position;
-
-        @TableField(exist = false)
-        private String pname;
-    
-}

hnls-admin/hnls-admin-service/src/main/java/com/tofly/base/entity/Projectinfo.java

@@ -1,59 +0,0 @@
-/*
- * Author: wangjian
- * 生成entity
- */
-package com.tofly.base.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-/**
- * 项目基本信息表
- *
- * @author wangjian
- * @date Tue Mar 24 00:00:00 CST 2020
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName(value="TF_SMPN_PROJECTINFO_X",resultMap = "projectinfoMap")
-@KeySequence("TF_SMPN_PROJECTINFO_X")
-@ApiModel
-public class Projectinfo extends Model<Projectinfo> {
-    private static final long serialVersionUID = 1L;
-
-        /**
-     * 主键，ID
-     */
-        @TableId(value = "ID",type= IdType.INPUT)
-        @ApiModelProperty(value = "主键，ID")
-                private Long id;
-            /**
-     * 项目名称
-     */
-        @ApiModelProperty(value = "项目名称")
-                private String projectName;
-            /**
-     * 项目logo
-     */
-        @ApiModelProperty(value = "项目logo")
-                private String projectLogo;
-            /**
-     * 项目说明
-     */
-        @ApiModelProperty(value = "项目说明")
-                private String projectInfo;
-            /**
-     * 电话
-     */
-        @ApiModelProperty(value = "电话")
-                private String tel;
-        
-}