From ba6c02d49a28f2d3aa43b5d11e37e5977a90e70e Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 19 十二月 2023 14:15:06 +0800 Subject: [PATCH] # --- zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleResourceServiceImpl.java | 19 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserLoginMapper.java | 16 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ResourceMapper.java | 12 zy-asrs-common/src/main/resources/mapper/wms/HostMapper.xml | 5 zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java | 41 - zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleMapper.java | 12 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/OperateLogMapper.java | 26 + zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/HostServiceImpl.java | 12 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/UserService.java | 8 zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java | 96 ++++ zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ConfigMapper.java | 12 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/ConfigService.java | 9 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/ResourceService.java | 8 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/UserLoginService.java | 10 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Host.java | 100 ++++ zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserLoginServiceImpl.java | 20 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/User.java | 141 ++++++ zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Config.java | 83 +++ zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Role.java | 94 ++++ zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java | 12 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/RoleResource.java | 33 + zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/HostMapper.java | 12 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserMapper.java | 12 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/OperateLog.java | 73 +++ zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/OperateLogServiceImpl.java | 33 + /dev/null | 27 - zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserServiceImpl.java | 12 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ResourceServiceImpl.java | 12 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/OperateLogService.java | 16 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/UserLogin.java | 59 ++ zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Resource.java | 111 +++++ zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/HostController.java | 24 + zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/RoleService.java | 9 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleResourceMapper.java | 20 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/RoleResourceService.java | 14 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/HostService.java | 9 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleServiceImpl.java | 12 37 files changed, 1,171 insertions(+), 53 deletions(-) diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/dao/PackMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/dao/PackMapper.java deleted file mode 100644 index 0d31bab..0000000 --- a/zy-asrs-common/src/main/java/com/zy/asrs/common/dao/PackMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.zy.asrs.common.dao; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zy.asrs.common.entity.Pack; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface PackMapper extends BaseMapper<Pack> { - - List<Pack> selectByMatnr(@Param("matnr") String matnr); - -} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/entity/Pack.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/entity/Pack.java deleted file mode 100644 index 9e746bb..0000000 --- a/zy-asrs-common/src/main/java/com/zy/asrs/common/entity/Pack.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.zy.asrs.common.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.text.SimpleDateFormat; -import java.util.Date; - -@Data -@TableName("man_pack") -public class Pack implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID - */ - @ApiModelProperty(value= "ID") - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - /** - * 鏉$爜 - */ - @ApiModelProperty(value= "鏉$爜") - private String barcode; - - /** - * 鐗╂枡鍙� - */ - @ApiModelProperty(value= "鐗╂枡鍙�") - private String matnr; - - /** - * 搴忓垪鐮� - */ - @ApiModelProperty(value= "搴忓垪鐮�") - private String batch; - - /** - * 璁㈠崟鐘舵�� - */ - @ApiModelProperty(value= "璁㈠崟鐘舵��") - private Long settle; - - /** - * 鐘舵�� 1: 姝e父 0: 绂佺敤 - */ - @ApiModelProperty(value= "鐘舵�� 1: 姝e父 0: 绂佺敤 ") - private Integer status; - - /** - * 娣诲姞鏃堕棿 - */ - @ApiModelProperty(value= "娣诲姞鏃堕棿") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date createTime; - - /** - * 娣诲姞浜哄憳 - */ - @ApiModelProperty(value= "娣诲姞浜哄憳") - private Long createBy; - - /** - * 淇敼鏃堕棿 - */ - @ApiModelProperty(value= "淇敼鏃堕棿") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private Date updateTime; - - /** - * 淇敼浜哄憳 - */ - @ApiModelProperty(value= "淇敼浜哄憳") - private Long updateBy; - - /** - * 澶囨敞 - */ - @ApiModelProperty(value= "澶囨敞") - private String memo; - -} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/service/PackService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/service/PackService.java deleted file mode 100644 index 315007f..0000000 --- a/zy-asrs-common/src/main/java/com/zy/asrs/common/service/PackService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.zy.asrs.common.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.zy.asrs.common.entity.Pack; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface PackService extends IService<Pack> { - - List<Pack> selectByMatnr(String matnr); - -} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/service/impl/PackServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/service/impl/PackServiceImpl.java deleted file mode 100644 index a7850e9..0000000 --- a/zy-asrs-common/src/main/java/com/zy/asrs/common/service/impl/PackServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.zy.asrs.common.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zy.asrs.common.dao.PackMapper; -import com.zy.asrs.common.entity.Pack; -import com.zy.asrs.common.service.PackService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Created by vincent on 12/19/2023 - */ -@Service("packService") -public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements PackService { - - @Autowired - private PackMapper packMapper; - - @Override - public List<Pack> selectByMatnr(String matnr) { - return this.packMapper.selectByMatnr(matnr); - } - -} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/HostController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/HostController.java new file mode 100644 index 0000000..39694a7 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/controller/HostController.java @@ -0,0 +1,24 @@ +package com.zy.asrs.common.sys.controller; + +import com.zy.asrs.common.sys.service.HostService; +import com.zy.asrs.common.web.BaseController; +import com.zy.asrs.framework.common.R; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HostController extends BaseController { + + @Autowired + private HostService hostService; + + @RequestMapping(value = "/host/{id}/auth") +// @ManagerAuth + public R get(@PathVariable("id") Long id) { + return R.ok(hostService.getById(String.valueOf(id))); + } + + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ConfigMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ConfigMapper.java new file mode 100644 index 0000000..ac56777 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ConfigMapper.java @@ -0,0 +1,12 @@ +package com.zy.asrs.common.sys.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zy.asrs.common.sys.entity.Config; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface ConfigMapper extends BaseMapper<Config> { + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/HostMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/HostMapper.java new file mode 100644 index 0000000..3a3bb06 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/HostMapper.java @@ -0,0 +1,12 @@ +package com.zy.asrs.common.sys.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zy.asrs.common.sys.entity.Host; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface HostMapper extends BaseMapper<Host> { + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/OperateLogMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/OperateLogMapper.java new file mode 100644 index 0000000..84a7dad --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/OperateLogMapper.java @@ -0,0 +1,26 @@ +package com.zy.asrs.common.sys.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zy.asrs.common.sys.entity.OperateLog; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Map; + +@Mapper +@Repository +public interface OperateLogMapper extends BaseMapper<OperateLog> { + + @Select("select count(1) from sys_operate_log where yearweek(date_format(create_time,'%Y-%m-%d')) = yearweek(now());") + int selectCountByCurrentWeek(); + + @Select("select MONTH(create_time) as node , count(1) as val from sys_operate_log where 1 = 1 and year(create_time) = #{year} group by MONTH(create_time)") + List<Map<String, Object>> getReportByYear(@Param("year") Integer year); + + @Select("select DAYOFMONTH(create_time) as node,count(1) as val from sys_operate_log where 1 = 1 and year(create_time) = #{year} and month(create_time) = #{month} group by DAYOFMONTH(create_time)") + List<Map<String, Object>> getReportByMonth(@Param("year") Integer year, @Param("month") Integer month); + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ResourceMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ResourceMapper.java new file mode 100644 index 0000000..2a346e2 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/ResourceMapper.java @@ -0,0 +1,12 @@ +package com.zy.asrs.common.sys.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zy.asrs.common.sys.entity.Resource; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface ResourceMapper extends BaseMapper<Resource> { + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleMapper.java new file mode 100644 index 0000000..0b0b505 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleMapper.java @@ -0,0 +1,12 @@ +package com.zy.asrs.common.sys.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zy.asrs.common.sys.entity.Role; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface RoleMapper extends BaseMapper<Role> { + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleResourceMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleResourceMapper.java new file mode 100644 index 0000000..eb525d1 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/RoleResourceMapper.java @@ -0,0 +1,20 @@ +package com.zy.asrs.common.sys.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zy.asrs.common.sys.entity.Resource; +import com.zy.asrs.common.sys.entity.RoleResource; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Mapper +@Repository +public interface RoleResourceMapper extends BaseMapper<RoleResource> { + + @Select("select sr.* from sys_resource sr left join sys_role_resource srr on srr.resource_id = sr.id left join sys_user su on su.role_id = srr.role_id where 1 = 1 and su.id = #{userId} and sr. level = 3 and sr.resource_id = #{fatherResourceId} and sr. status = 1 order by sr.sort") + List<Resource> getMenuButtomResource(@Param("fatherResourceId") Long fatherResourceId, @Param("userId") Long userId); + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserLoginMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserLoginMapper.java new file mode 100644 index 0000000..c1a7a27 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserLoginMapper.java @@ -0,0 +1,16 @@ +package com.zy.asrs.common.sys.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zy.asrs.common.sys.entity.UserLogin; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface UserLoginMapper extends BaseMapper<UserLogin> { + + @Select("select count(1) from sys_user_login where yearweek(date_format(create_time,'%Y-%m-%d')) = yearweek(now())") + int selectCountByCurrentWeek(); + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserMapper.java new file mode 100644 index 0000000..bf96ab4 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/dao/UserMapper.java @@ -0,0 +1,12 @@ +package com.zy.asrs.common.sys.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zy.asrs.common.sys.entity.User; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface UserMapper extends BaseMapper<User> { + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Config.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Config.java new file mode 100644 index 0000000..3dabc60 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Config.java @@ -0,0 +1,83 @@ +package com.zy.asrs.common.sys.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_config") +public class Config implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 缂栧彿 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 鍚嶇О + */ + private String name; + + /** + * 缂栫爜 + */ + private String code; + + /** + * 瀵瑰簲鍊� + */ + private String value; + + /** + * 绫诲瀷 1: String 2: JSON + */ + private Short type; + + /** + * 鐘舵�� 1: 姝e父 0: 绂佺敤 + */ + private Short status; + + public Config() {} + + public Config(String name,String code,String value,Short type,Short status) { + this.name = name; + this.code = code; + this.value = value; + this.type = type; + this.status = status; + } + + + public String getType$(){ + if (null == this.type){ return null; } + switch (this.type){ + case 1: + return "String"; + case 2: + return "JSON"; + default: + return String.valueOf(this.type); + } + } + + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 1: + return "姝e父"; + case 0: + return "绂佺敤"; + default: + return String.valueOf(this.status); + } + } + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Host.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Host.java new file mode 100644 index 0000000..87e3a08 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Host.java @@ -0,0 +1,100 @@ +package com.zy.asrs.common.sys.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.zy.asrs.framework.common.Cools; +import lombok.Data; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.Date; + +@Data +@TableName("sys_host") +public class Host implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 缂栧彿 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 鍟嗘埛鍚嶇О + */ + private String name; + + /** + * 鏍囪瘑 + */ + private String flag; + + /** + * 娣诲姞鏃堕棿 + */ + private Date createTime; + + /** + * 淇敼鏃堕棿 + */ + private Date updateTime; + + /** + * 鐘舵�� 1: 姝e父 0: 绂佺敤 + */ + private Integer status; + + public Host() {} + + public Host(String name,String flag,Date createTime,Date updateTime,Integer status) { + this.name = name; + this.flag = flag; + this.createTime = createTime; + this.updateTime = updateTime; + this.status = status; + } + +// Host host = new Host( +// null, // 鍟嗘埛鍚嶇О[闈炵┖] +// null, // 鏍囪瘑[闈炵┖] +// null, // 娣诲姞鏃堕棿[闈炵┖] +// null, // 淇敼鏃堕棿 +// null // 鐘舵�乕闈炵┖] +// ); + + + public String getCreateTime$(){ + if (Cools.isEmpty(this.createTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime); + } + + public Date getUpdateTime() { + return updateTime; + } + + public String getUpdateTime$(){ + if (Cools.isEmpty(this.updateTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime); + } + + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 1: + return "姝e父"; + case 0: + return "绂佺敤"; + default: + return String.valueOf(this.status); + } + } + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/OperateLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/OperateLog.java new file mode 100644 index 0000000..4725f5f --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/OperateLog.java @@ -0,0 +1,73 @@ +package com.zy.asrs.common.sys.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.zy.asrs.common.sys.service.UserService; +import com.zy.asrs.framework.common.Cools; +import com.zy.asrs.framework.common.SpringUtils; +import lombok.Data; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.Date; + +@Data +@TableName("sys_operate_log") +public class OperateLog implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 缂栧彿 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 璁块棶鍦板潃 + */ + private String action; + + /** + * 鐢ㄦ埛 + */ + private Long userId; + + /** + * 瀹㈡埛绔疘P + */ + private String ip; + + /** + * 璇锋眰鏁版嵁 + */ + private String request; + + /** + * 鍝嶅簲鏁版嵁 + */ + private String response; + + /** + * 娣诲姞鏃堕棿 + */ + private Date createTime; + + public String getUserId$(){ + UserService service = SpringUtils.getBean(UserService.class); + User user = service.getById(this.userId); + if (!Cools.isEmpty(user)){ + return user.getUsername(); + } + return null; + } + + public String getCreateTime$(){ + if (Cools.isEmpty(this.createTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime); + } + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Resource.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Resource.java new file mode 100644 index 0000000..759338d --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Resource.java @@ -0,0 +1,111 @@ +package com.zy.asrs.common.sys.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.zy.asrs.common.sys.service.ResourceService; +import com.zy.asrs.framework.common.Cools; +import com.zy.asrs.framework.common.SpringUtils; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_resource") +public class Resource implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 缂栧彿 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 鑿滃崟缂栫爜 + */ + private String code; + + /** + * 鑿滃崟鍚嶇О + */ + private String name; + + /** + * 鐖剁骇鑿滃崟 + */ + private Long resourceId; + + /** + * 鑿滃崟绛夌骇 1: 涓�绾ц彍鍗� 2: 浜岀骇鑿滃崟 + */ + private Short level; + + /** + * 鎺掑簭 + */ + private Integer sort; + + /** + * 鐘舵�� 1: 姝e父 0: 绂佺敤 + */ + private Short status; + + public Resource() {} + + public Resource(String code,String name,Long resourceId,Short level,Integer sort,Short status) { + this.code = code; + this.name = name; + this.resourceId = resourceId; + this.level = level; + this.sort = sort; + this.status = status; + } + +// Resource resource = new Resource( +// null, // 鑿滃崟缂栫爜[闈炵┖] +// null, // 鑿滃崟鍚嶇О[闈炵┖] +// null, // 鐖剁骇鑿滃崟 +// null, // 鑿滃崟绛夌骇[闈炵┖] +// null, // 鎺掑簭 +// null // 鐘舵�乕闈炵┖] +// ); + + + public String getResourceName(){ + ResourceService service = SpringUtils.getBean(ResourceService.class); + Resource resource = service.getById(this.resourceId); + if (!Cools.isEmpty(resource)){ + return resource.getName(); + } + return null; + } + + public String getLevel$(){ + if (null == this.level){ return null; } + switch (this.level){ + case 1: + return "涓�绾ц彍鍗�"; + case 2: + return "浜岀骇鑿滃崟"; + case 3: + return "涓夌骇鑿滃崟"; + default: + return String.valueOf(this.level); + } + } + + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 1: + return "姝e父"; + case 0: + return "绂佺敤"; + default: + return String.valueOf(this.status); + } + } + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Role.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Role.java new file mode 100644 index 0000000..ebe9b6d --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Role.java @@ -0,0 +1,94 @@ +package com.zy.asrs.common.sys.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.zy.asrs.common.sys.service.RoleService; +import com.zy.asrs.framework.common.Cools; +import com.zy.asrs.framework.common.SpringUtils; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_role") +public class Role implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 缂栧彿 + */ + @ApiModelProperty(value= "缂栧彿") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 缂栫爜 + */ + @ApiModelProperty(value= "缂栫爜") + private String code; + + /** + * 鍚嶇О + */ + @ApiModelProperty(value= "鍚嶇О") + private String name; + + /** + * 涓婄骇 + */ + @ApiModelProperty(value= "涓婄骇") + private Long leader; + + /** + * 瑙掕壊绛夌骇 1: 涓�绾� 2: 浜岀骇 3: 涓夌骇 4: 鍥涚骇 5: 浜旂骇 + */ + @ApiModelProperty(value= "瑙掕壊绛夌骇 1: 涓�绾� 2: 浜岀骇 3: 涓夌骇 4: 鍥涚骇 5: 浜旂骇 ") + private Short level; + + public Role() {} + + public Role(String code,String name,Long leader,Short level) { + this.code = code; + this.name = name; + this.leader = leader; + this.level = level; + } + +// Role role = new Role( +// null, // 缂栫爜[闈炵┖] +// null, // 鍚嶇О[闈炵┖] +// null, // 涓婄骇 +// null // 瑙掕壊绛夌骇 +// ); + + public String getLeader$(){ + RoleService service = SpringUtils.getBean(RoleService.class); + Role role = service.getById(this.leader); + if (!Cools.isEmpty(role)){ + return String.valueOf(role.getName()); + } + return null; + } + + public String getLevel$(){ + if (null == this.level){ return null; } + switch (this.level){ + case 1: + return "涓�绾�"; + case 2: + return "浜岀骇"; + case 3: + return "涓夌骇"; + case 4: + return "鍥涚骇"; + case 5: + return "浜旂骇"; + default: + return String.valueOf(this.level); + } + } + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/RoleResource.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/RoleResource.java new file mode 100644 index 0000000..6f31a08 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/RoleResource.java @@ -0,0 +1,33 @@ +package com.zy.asrs.common.sys.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("sys_role_resource") +public class RoleResource implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 缂栧彿 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 瑙掕壊 + */ + private Long roleId; + + /** + * 璧勬簮 + */ + private Long resourceId; + + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/User.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/User.java new file mode 100644 index 0000000..27489cc --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/User.java @@ -0,0 +1,141 @@ +package com.zy.asrs.common.sys.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.zy.asrs.common.sys.service.HostService; +import com.zy.asrs.common.sys.service.RoleService; +import com.zy.asrs.framework.common.Cools; +import com.zy.asrs.framework.common.SpringUtils; +import lombok.Data; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.Date; + +@Data +@TableName("sys_user") +public class User implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 缂栧彿 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 鎺堟潈鍟嗘埛 + */ + private Long hostId; + + + /** + * 鎵�灞為儴闂� + */ + private Long deptId; + + /** + * 瑙掕壊 + */ + private Long roleId; + + /** + * 璐﹀彿 + */ + private String username; + + /** + * 鍚嶇О + */ + private String nickname; + + /** + * 鎵嬫満鍙� + */ + private String mobile; + + /** + * 瀵嗙爜 + */ + private String password; + + /** + * 澶村儚 + */ + private String avatar; + + /** + * 閭 + */ + private String email; + + /** + * 鎬у埆 0: 鐢� 1: 濂� 2: 鏈煡 + */ + private Integer sex; + + /** + * 娉ㄥ唽鏃堕棿 + */ + private Date createTime; + + /** + * 鐘舵�� 1: 鍚敤 0: 绂佺敤 + */ + private Integer status; + + public String getHostName() { + HostService service = SpringUtils.getBean(HostService.class); + Host host = service.getById(this.hostId); + if (!Cools.isEmpty(host)){ + return host.getName(); + } + return null; + } + + + public String getSex$(){ + if (null == this.sex){ return null; } + switch (this.sex){ + case 0: + return "鐢�"; + case 1: + return "濂�"; + case 2: + return "鏈煡"; + default: + return String.valueOf(this.sex); + } + } + + public String getRoleName(){ + RoleService service = SpringUtils.getBean(RoleService.class); + Role role = service.getById(this.roleId); + if (!Cools.isEmpty(role)){ + return role.getName(); + } + return null; + } + + public String getCreateTime$(){ + if (Cools.isEmpty(this.createTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime); + } + + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 1: + return "鍚敤"; + case 0: + return "绂佺敤"; + default: + return String.valueOf(this.status); + } + } + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/UserLogin.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/UserLogin.java new file mode 100644 index 0000000..495a444 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/UserLogin.java @@ -0,0 +1,59 @@ +package com.zy.asrs.common.sys.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.zy.asrs.common.sys.service.UserService; +import com.zy.asrs.framework.common.Cools; +import com.zy.asrs.framework.common.SpringUtils; +import lombok.Data; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.Date; + +@Data +@TableName("sys_user_login") +public class UserLogin implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 缂栧彿 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 鍛樺伐 + */ + private Long userId; + + /** + * 鍑瘉鍊� + */ + private String token; + + /** + * 娣诲姞鏃堕棿 + */ + private Date createTime; + + public String getUserUsername(){ + UserService service = SpringUtils.getBean(UserService.class); + User user = service.getById(this.userId); + if (!Cools.isEmpty(user)){ + return user.getUsername(); + } + return null; + } + + public String getCreateTime$(){ + if (Cools.isEmpty(this.createTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime); + } + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/ConfigService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/ConfigService.java new file mode 100644 index 0000000..efe0acf --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/ConfigService.java @@ -0,0 +1,9 @@ +package com.zy.asrs.common.sys.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zy.asrs.common.sys.entity.Config; + +public interface ConfigService extends IService<Config> { + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/HostService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/HostService.java new file mode 100644 index 0000000..773f28e --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/HostService.java @@ -0,0 +1,9 @@ +package com.zy.asrs.common.sys.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zy.asrs.common.sys.entity.Host; + +public interface HostService extends IService<Host> { + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/OperateLogService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/OperateLogService.java new file mode 100644 index 0000000..d2c2285 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/OperateLogService.java @@ -0,0 +1,16 @@ +package com.zy.asrs.common.sys.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zy.asrs.common.sys.entity.OperateLog; + +import java.util.List; +import java.util.Map; + +public interface OperateLogService extends IService<OperateLog> { + + int selectCountByCurrentWeek(); + + List<Map<String, Object>> getReport(Integer year, Integer month); + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/ResourceService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/ResourceService.java new file mode 100644 index 0000000..66a70a9 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/ResourceService.java @@ -0,0 +1,8 @@ +package com.zy.asrs.common.sys.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zy.asrs.common.sys.entity.Resource; + +public interface ResourceService extends IService<Resource> { + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/RoleResourceService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/RoleResourceService.java new file mode 100644 index 0000000..1ea1d7e --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/RoleResourceService.java @@ -0,0 +1,14 @@ +package com.zy.asrs.common.sys.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zy.asrs.common.sys.entity.Resource; +import com.zy.asrs.common.sys.entity.RoleResource; + +import java.util.List; + +public interface RoleResourceService extends IService<RoleResource> { + + List<Resource> getMenuButtomResource(Long fatherResourceId, Long userId); + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/RoleService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/RoleService.java new file mode 100644 index 0000000..648e88c --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/RoleService.java @@ -0,0 +1,9 @@ +package com.zy.asrs.common.sys.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zy.asrs.common.sys.entity.Role; + +public interface RoleService extends IService<Role> { + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/UserLoginService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/UserLoginService.java new file mode 100644 index 0000000..9f2e7f2 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/UserLoginService.java @@ -0,0 +1,10 @@ +package com.zy.asrs.common.sys.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zy.asrs.common.sys.entity.UserLogin; + +public interface UserLoginService extends IService<UserLogin> { + + int selectCountByCurrentWeek(); + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/UserService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/UserService.java new file mode 100644 index 0000000..3541f3a --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/UserService.java @@ -0,0 +1,8 @@ +package com.zy.asrs.common.sys.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.zy.asrs.common.sys.entity.User; + +public interface UserService extends IService<User> { + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java new file mode 100644 index 0000000..b9248b7 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java @@ -0,0 +1,12 @@ +package com.zy.asrs.common.sys.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zy.asrs.common.sys.entity.Config; +import com.zy.asrs.common.sys.dao.ConfigMapper; +import com.zy.asrs.common.sys.service.ConfigService; +import org.springframework.stereotype.Service; + +@Service("configService") +public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, Config> implements ConfigService { + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/HostServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/HostServiceImpl.java new file mode 100644 index 0000000..5688537 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/HostServiceImpl.java @@ -0,0 +1,12 @@ +package com.zy.asrs.common.sys.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zy.asrs.common.sys.entity.Host; +import com.zy.asrs.common.sys.dao.HostMapper; +import com.zy.asrs.common.sys.service.HostService; +import org.springframework.stereotype.Service; + +@Service("hostService") +public class HostServiceImpl extends ServiceImpl<HostMapper, Host> implements HostService { + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/OperateLogServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/OperateLogServiceImpl.java new file mode 100644 index 0000000..6ba3b4c --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/OperateLogServiceImpl.java @@ -0,0 +1,33 @@ +package com.zy.asrs.common.sys.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zy.asrs.common.sys.entity.OperateLog; +import com.zy.asrs.common.sys.dao.OperateLogMapper; +import com.zy.asrs.common.sys.service.OperateLogService; +import com.zy.asrs.framework.common.Cools; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +@Service("operateLogService") +public class OperateLogServiceImpl extends ServiceImpl<OperateLogMapper, OperateLog> implements OperateLogService { + + @Autowired + private OperateLogMapper operateLogMapper; + + @Override + public int selectCountByCurrentWeek() { + return operateLogMapper.selectCountByCurrentWeek(); + } + + @Override + public List<Map<String, Object>> getReport(Integer year, Integer month) { + if (Cools.isEmpty(month)) { + return operateLogMapper.getReportByYear(year); + } + return operateLogMapper.getReportByMonth(year, month); + } + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ResourceServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ResourceServiceImpl.java new file mode 100644 index 0000000..8f2019a --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ResourceServiceImpl.java @@ -0,0 +1,12 @@ +package com.zy.asrs.common.sys.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zy.asrs.common.sys.entity.Resource; +import com.zy.asrs.common.sys.dao.ResourceMapper; +import com.zy.asrs.common.sys.service.ResourceService; +import org.springframework.stereotype.Service; + +@Service("resourceService") +public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> implements ResourceService { + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleResourceServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleResourceServiceImpl.java new file mode 100644 index 0000000..f6e72cd --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleResourceServiceImpl.java @@ -0,0 +1,19 @@ +package com.zy.asrs.common.sys.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zy.asrs.common.sys.entity.Resource; +import com.zy.asrs.common.sys.entity.RoleResource; +import com.zy.asrs.common.sys.dao.RoleResourceMapper; +import com.zy.asrs.common.sys.service.RoleResourceService; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service("roleResourceService") +public class RoleResourceServiceImpl extends ServiceImpl<RoleResourceMapper, RoleResource> implements RoleResourceService { + + @Override + public List<Resource> getMenuButtomResource(Long fatherResourceId, Long userId) { + return this.baseMapper.getMenuButtomResource(fatherResourceId, userId); + } +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleServiceImpl.java new file mode 100644 index 0000000..ba74a96 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/RoleServiceImpl.java @@ -0,0 +1,12 @@ +package com.zy.asrs.common.sys.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zy.asrs.common.sys.entity.Role; +import com.zy.asrs.common.sys.dao.RoleMapper; +import com.zy.asrs.common.sys.service.RoleService; +import org.springframework.stereotype.Service; + +@Service("roleService") +public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService { + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserLoginServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserLoginServiceImpl.java new file mode 100644 index 0000000..234085b --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserLoginServiceImpl.java @@ -0,0 +1,20 @@ +package com.zy.asrs.common.sys.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zy.asrs.common.sys.entity.UserLogin; +import com.zy.asrs.common.sys.dao.UserLoginMapper; +import com.zy.asrs.common.sys.service.UserLoginService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service("userLoginService") +public class UserLoginServiceImpl extends ServiceImpl<UserLoginMapper, UserLogin> implements UserLoginService { + + @Autowired + private UserLoginMapper userLoginMapper; + + @Override + public int selectCountByCurrentWeek() { + return userLoginMapper.selectCountByCurrentWeek(); + } +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserServiceImpl.java new file mode 100644 index 0000000..67f3e53 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/UserServiceImpl.java @@ -0,0 +1,12 @@ +package com.zy.asrs.common.sys.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zy.asrs.common.sys.entity.User; +import com.zy.asrs.common.sys.dao.UserMapper; +import com.zy.asrs.common.sys.service.UserService; +import org.springframework.stereotype.Service; + +@Service("userService") +public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService { + +} diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java new file mode 100644 index 0000000..fefc3f6 --- /dev/null +++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/BaseController.java @@ -0,0 +1,96 @@ +package com.zy.asrs.common.web; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zy.asrs.common.sys.entity.User; +import com.zy.asrs.common.sys.service.UserService; +import com.zy.asrs.framework.common.BaseRes; +import com.zy.asrs.framework.common.Cools; +import com.zy.asrs.framework.controller.AbstractBaseController; +import com.zy.asrs.framework.exception.CoolException; +import io.swagger.annotations.ApiModelProperty; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.servlet.http.HttpServletRequest; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.*; + +/** + * Created by vincent on 2019-09-09 + */ +public class BaseController extends AbstractBaseController { + + protected static final String RANGE_TIME_LINK = " - "; + + @Autowired + protected HttpServletRequest request; + @Autowired + private UserService userService; + + protected Long getUserId(){ + return Long.parseLong(String.valueOf(request.getAttribute("userId"))); + } + + protected User getUser(){ + User user = userService.getById(getUserId()); + if (null == user) { + throw new CoolException(BaseRes.DENIED); + } + return user; + } + + protected String getComment(Class<?> cls, String fieldName){ + Field[] fields = Cools.getAllFields(cls); + for (Field field : fields){ + if (fieldName.equals(field.getName())){ + return field.getAnnotation(ApiModelProperty.class).value(); + } + } + return ""; + } + + /** + * 鍒嗛〉缁勮 + * @param pageNumber + * @param pageSize + * @param map + * @param cls + * @param <T> + * @return + */ + protected <T> Page<T> toPage(Integer pageNumber, Integer pageSize, Map<String, Object> map, Class<T> cls){ + // 鍒嗛〉绱㈠紩鍜屽崟椤垫暟閲忕粍瑁� + pageNumber = Optional.ofNullable(pageNumber).orElse(1); + pageSize = Optional.ofNullable(pageSize).orElse(10); + Page<T> page = new Page<>(pageNumber, pageSize); + map.put("pageNumber", pageNumber); + map.put("pageSize", pageSize); + + // 鍏ㄥ瓧娈垫ā绯婃悳绱� todo + if (!Cools.isEmpty(map.get("condition"))) { + Set<String> columns = new HashSet<>(); + for (Field field : Cools.getAllFields(cls)){ + if (Modifier.isFinal(field.getModifiers()) + || Modifier.isStatic(field.getModifiers()) + || Modifier.isTransient(field.getModifiers())){ + continue; + } + String column = null; + if (field.isAnnotationPresent(TableField.class)) { + column = field.getAnnotation(TableField.class).value(); + } + if (Cools.isEmpty(column)) { + column = field.getName(); + } + if (!map.keySet().contains(column)) { + columns.add(column); + } + } + columns.forEach(col->map.put(col, map.get("condition"))); + } +// page.setCondition(map); + return page; + } + +} diff --git a/zy-asrs-common/src/main/resources/mapper/PackMapper.xml b/zy-asrs-common/src/main/resources/mapper/PackMapper.xml deleted file mode 100644 index a4931dd..0000000 --- a/zy-asrs-common/src/main/resources/mapper/PackMapper.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.zy.asrs.common.dao.PackMapper"> - - <select id="selectByMatnr" resultType="com.zy.asrs.common.entity.Pack"> - select * from man_pack where matnr = #{matnr} - </select> - -</mapper> diff --git a/zy-asrs-common/src/main/resources/mapper/wms/HostMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/HostMapper.xml new file mode 100644 index 0000000..d424d3c --- /dev/null +++ b/zy-asrs-common/src/main/resources/mapper/wms/HostMapper.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.zy.asrs.common.sys.dao.HostMapper"> + +</mapper> diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java index e131455..9273d4a 100644 --- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java +++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/CoolGenerator.java @@ -49,10 +49,11 @@ public boolean entity = true; public boolean xml = true; public boolean html = true; - public boolean htmlDetail = false; public boolean js = true; public boolean sql = true; public SqlOsType sqlOsType; + public String backendPrefixPath; + public String frontendPrefixPath; private List<Column> columns = new ArrayList<>(); private String fullEntityName; @@ -82,48 +83,49 @@ switch (template){ case "Controller": pass = controller; - directory = JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/"; + directory = backendPrefixPath + JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/"; fileName = fullEntityName+template+".java"; break; case "Service": pass = service; - directory = JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/"; + directory = backendPrefixPath + JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/"; fileName = fullEntityName+template+".java"; break; case "ServiceImpl": pass = service; - directory = JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/"; + directory = backendPrefixPath + JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/"; fileName = fullEntityName+template+".java"; break; case "Mapper": pass = mapper; - directory = JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/"; + directory = backendPrefixPath + JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/"; fileName = fullEntityName+template+".java"; break; case "Entity": pass = entity; - directory = JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/"; + directory = backendPrefixPath + JAVA_DIR + packagePath.replace(".", "/")+"/"+templatePath+"/"; fileName = fullEntityName+".java"; break; case "Xml": pass = xml; - directory = XML_DIR; + directory = backendPrefixPath + XML_DIR; fileName = fullEntityName+"Mapper.xml"; + break; + case "Sql": + pass = sql; + directory = backendPrefixPath + JAVA_DIR; + fileName = simpleEntityName+".sql"; break; case "Html": pass = html; - directory = HTML_DIR + "/views/" + simpleEntityName + "/"; + directory = frontendPrefixPath + HTML_DIR + "/views/" + simpleEntityName + "/"; fileName = simpleEntityName+".html"; break; case "Js": pass = js; - directory = HTML_DIR + "/static/js/" + simpleEntityName + "/"; + directory = frontendPrefixPath + HTML_DIR + "/static/js/" + simpleEntityName + "/"; fileName = simpleEntityName+".js"; break; - case "Sql": - pass = sql; - directory = JAVA_DIR; - fileName = simpleEntityName+".sql"; default: break; } @@ -411,19 +413,6 @@ entityIm.append("import com.core.common.SpringUtils;\n") .append("import ").append(SYSTEM_MODEL.contains(column.getForeignKey())?systemPackagePath:packagePath).append(".service.").append(column.getForeignKey()).append("Service;\n") .append("import ").append(SYSTEM_MODEL.contains(column.getForeignKey())?systemPackagePath:packagePath).append(".entity.").append(column.getForeignKey()).append(";\n"); - } - - // 鍛藉悕杞崲娉ㄨВ - if (!column.getName().equals(column.getHumpName())){ - if (setTableField){ - entityIm.append("import com.baomidou.mybatisplus.annotations.TableField;").append("\n"); - setTableField = false; - } - sb.append(" ") - .append("@TableField(\"") - .append(column.getName()) - .append("\")") - .append("\n"); } if ("Date".equals(column.getType())){ diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PackController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PackController.java deleted file mode 100644 index bb60df4..0000000 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PackController.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.zy.asrs.wms.controller; - -import com.alibaba.fastjson.JSON; -import com.zy.asrs.common.entity.Pack; -import com.zy.asrs.common.service.PackService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * Created by vincent on 12/19/2023 - */ -@RestController -public class PackController { - - @Autowired - private PackService packService; - - @GetMapping("/test") - public String get() { - List<Pack> packs = packService.selectByMatnr("1"); - return JSON.toJSONString(packs); - } - -} -- Gitblit v1.9.1