Browse Source

脚本适配

wangyongsheng 9 months ago
parent
commit
cbe2ce7a06
32 changed files with 274 additions and 50 deletions
  1. 3 1
      src/main/java/com/kcim/DemoApplication.java
  2. 1 1
      src/main/java/com/kcim/config/CorsConfig.java
  3. 1 1
      src/main/java/com/kcim/config/FeignConfiguration.java
  4. 1 1
      src/main/java/com/kcim/config/MybatisPlusConfig.java
  5. 1 1
      src/main/java/com/kcim/config/MybatisPlusMetaObjectHandler.java
  6. 1 1
      src/main/java/com/kcim/config/RedisProcessor.java
  7. 1 1
      src/main/java/com/kcim/constants/NumberConstant.java
  8. 4 4
      src/main/java/com/kcim/controller/DemoController.java
  9. 2 2
      src/main/java/com/kcim/dao/mapper/TestMapper.java
  10. 1 1
      src/main/java/com/kcim/dao/model/Test.java
  11. 4 3
      src/main/java/com/kcim/dao/repository/TestRepository.java
  12. 1 1
      src/main/java/com/kcim/endpoint/CenterEndPoint.java
  13. 64 0
      src/main/java/com/kcim/enums/DateStyleEnum.java
  14. 60 0
      src/main/java/com/kcim/enums/ResultCodeEnum.java
  15. 96 0
      src/main/java/com/kcim/enums/WeekEnum.java
  16. 1 1
      src/main/java/com/kcim/nacosdiscovery/NacosDiscoveryConfiguration.java
  17. 2 2
      src/main/java/com/kcim/service/DemoService.java
  18. 8 8
      src/main/java/com/kcim/service/impl/DemoServiceImpl.java
  19. 1 1
      src/main/java/com/kcim/util/AesUtil.java
  20. 1 1
      src/main/java/com/kcim/util/BeanUtil.java
  21. 1 1
      src/main/java/com/kcim/util/CommonUtil.java
  22. 3 3
      src/main/java/com/kcim/util/DateUtils.java
  23. 1 1
      src/main/java/com/kcim/util/ErrorResult.java
  24. 1 1
      src/main/java/com/kcim/util/JacksonUtil.java
  25. 1 1
      src/main/java/com/kcim/util/PageUtils.java
  26. 1 1
      src/main/java/com/kcim/util/RedisLock.java
  27. 2 2
      src/main/java/com/kcim/util/Result.java
  28. 1 1
      src/main/java/com/kcim/util/SnowflakeUtil.java
  29. 1 1
      src/main/java/com/kcim/util/ThreadUtil.java
  30. 3 4
      src/main/java/com/kcim/util/UserContext.java
  31. 1 1
      src/main/java/com/kcim/vo/SessionUserVO.java
  32. 4 2
      src/main/resources/application.yml

+ 3 - 1
src/main/java/com/example/demo/DemoApplication.java → src/main/java/com/kcim/DemoApplication.java

@@ -1,4 +1,4 @@
-package com.example.demo;
+package com.kcim;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -8,6 +8,8 @@ public class DemoApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(DemoApplication.class, args);
+        System.out.println("============================启动成功==========================================");
+
     }
 
 }

+ 1 - 1
src/main/java/com/example/demo/config/CorsConfig.java → src/main/java/com/kcim/config/CorsConfig.java

@@ -1,4 +1,4 @@
-package com.example.demo.config;
+package com.kcim.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

+ 1 - 1
src/main/java/com/example/demo/config/FeignConfiguration.java → src/main/java/com/kcim/config/FeignConfiguration.java

@@ -1,4 +1,4 @@
-package com.example.demo.config;
+package com.kcim.config;
 
 import feign.RequestInterceptor;
 import feign.RequestTemplate;

+ 1 - 1
src/main/java/com/example/demo/config/MybatisPlusConfig.java → src/main/java/com/kcim/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.example.demo.config;
+package com.kcim.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;

+ 1 - 1
src/main/java/com/example/demo/config/MybatisPlusMetaObjectHandler.java → src/main/java/com/kcim/config/MybatisPlusMetaObjectHandler.java

@@ -1,4 +1,4 @@
-package com.example.demo.config;
+package com.kcim.config;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;

+ 1 - 1
src/main/java/com/example/demo/config/RedisProcessor.java → src/main/java/com/kcim/config/RedisProcessor.java

@@ -1,4 +1,4 @@
-package com.example.demo.config;
+package com.kcim.config;
 
 import cn.hutool.core.util.StrUtil;
 import org.springframework.data.redis.cache.RedisCache;

+ 1 - 1
src/main/java/com/example/demo/constants/NumberConstant.java → src/main/java/com/kcim/constants/NumberConstant.java

@@ -1,4 +1,4 @@
-package com.example.demo.constants;
+package com.kcim.constants;
 
 /**
  * 数字设置

+ 4 - 4
src/main/java/com/example/demo/controller/DemoController.java → src/main/java/com/kcim/controller/DemoController.java

@@ -1,8 +1,8 @@
-package com.example.demo.controller;
+package com.kcim.controller;
 
-import com.example.demo.dao.model.Test;
-import com.example.demo.service.DemoService;
-import com.example.demo.util.Result;
+import com.kcim.dao.model.Test;
+import com.kcim.service.DemoService;
+import com.kcim.util.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;

+ 2 - 2
src/main/java/com/example/demo/dao/mapper/TestMapper.java → src/main/java/com/kcim/dao/mapper/TestMapper.java

@@ -1,7 +1,7 @@
-package com.example.demo.dao.mapper;
+package com.kcim.dao.mapper;
 
-import com.example.demo.dao.model.Test;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kcim.dao.model.Test;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

+ 1 - 1
src/main/java/com/example/demo/dao/model/Test.java → src/main/java/com/kcim/dao/model/Test.java

@@ -1,4 +1,4 @@
-package com.example.demo.dao.model;
+package com.kcim.dao.model;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;

+ 4 - 3
src/main/java/com/example/demo/dao/repository/TestRepository.java → src/main/java/com/kcim/dao/repository/TestRepository.java

@@ -1,10 +1,11 @@
-package com.example.demo.dao.repository;
+package com.kcim.dao.repository;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.example.demo.dao.mapper.TestMapper;
-import com.example.demo.dao.model.Test;
+import com.kcim.dao.mapper.TestMapper;
+import com.kcim.dao.model.Test;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.StringUtils;
 

+ 1 - 1
src/main/java/com/example/demo/endpoint/CenterEndPoint.java → src/main/java/com/kcim/endpoint/CenterEndPoint.java

@@ -1,4 +1,4 @@
-package com.example.demo.endpoint;
+package com.kcim.endpoint;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;

+ 64 - 0
src/main/java/com/kcim/enums/DateStyleEnum.java

@@ -0,0 +1,64 @@
+package com.kcim.enums;
+
+public enum DateStyleEnum {
+    DD("dd"),
+    MM_DD("MM-dd"),
+    YYYY("yyyy"),
+    YYYYMM("yyyyMM"),
+    YYYY_MM("yyyy-MM"),
+    MM("MM"),
+    YYYY_MM_DD("yyyy-MM-dd"),
+    MM_DD_HH_MM("MM-dd HH:mm"),
+    MM_DD_HH_MM_SS("MM-dd HH:mm:ss"),
+    YYYY_MM_DD_HH("yyyy-MM-dd HH"),
+    YYYY_MM_DD_HH_MM("yyyy-MM-dd HH:mm"),
+    YYYY_MM_DD_HH_MM_SS("yyyy-MM-dd HH:mm:ss"),
+
+    MM_DD_EN("MM/dd"),
+    YYYY_MM_EN("yyyy/MM"),
+    YYYY_MM_DD_EN("yyyy/MM/dd"),
+    MM_DD_HH_MM_EN("MM/dd HH:mm"),
+    MM_DD_HH_MM_SS_EN("MM/dd HH:mm:ss"),
+    YYYY_MM_DD_HH_MM_EN("yyyy/MM/dd HH:mm"),
+    YYYY_MM_DD_HH_MM_SS_EN("yyyy/MM/dd HH:mm:ss"),
+    YYYY_M_D_H_MM_SS_EN("yyyy/M/d H:mm:ss"),
+
+    MM_DD_CN("MM月dd日"),
+    YYYY_MM_CN("yyyy年MM月"),
+    YYYY_MM_DD_CN("yyyy年MM月dd日"),
+    MM_DD_HH_MM_CN("MM月dd日 HH:mm"),
+    MM_DD_HH_MM_SS_CN("MM月dd日 HH:mm:ss"),
+    YYYY_MM_DD_HH_MM_CN("yyyy年MM月dd日 HH:mm"),
+    YYYY_MM_DD_HH_MM_SS_CN("yyyy年MM月dd日 HH:mm:ss"),
+
+    HH("HH"),
+    HH_MM("HH:mm"),
+    HH_MM_SS("HH:mm:ss"),
+
+    YYYYMMDD("yyyyMMdd"),
+    YYYYMMDD_HH_MM_SS("yyyyMMdd HH:mm:ss"),
+
+    YYMMDDHHMMSS("yyyyMMddHHmmss"),
+
+    YYMMDDHHMMSSSSS("yyMMddHHmmssSSS"),
+
+    YYYYMMDDHHMMSSSSS("yyyyMMddHHmmssSSS"),
+
+    SSSSSS("ssSSSS"),
+
+    HHMMSS("HHmmss"),
+
+    AM("上午"),
+
+    PM("下午");
+
+    private final String value;
+
+    DateStyleEnum(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

+ 60 - 0
src/main/java/com/kcim/enums/ResultCodeEnum.java

@@ -0,0 +1,60 @@
+package com.kcim.enums;
+
+/**
+ * @author 李加喜
+ * @Package com.imed.costaccount.enums
+ * @date 2021-07-26 15:12
+ */
+public enum ResultCodeEnum {
+
+    SUCCESS(200, "返回成功", "Return Success"),
+    UPDATE_INSERT_SUCCESS(201,"新建或修改数据成功","Return Success"),
+    ASYNCHRONOUS_TASKS(202,"一个请求已经进入后台排队(异步任务)"),
+    DELETE_SUCCESS(203,"删除数据成功"),
+
+    FAIL(500, "返回失败", "Return Failed"),
+    ILLEGAL_ARGUMENT(400, "非法参数", "Illegal Argument"),
+    UNAUTHORIZED(401, "认证失败", "Unauthorized"),
+    FORBIDDEN(403, "登陆失效", "Forbidden"),
+    URL_NOT_FOUND(404,"路径不存在"),
+    METHOD_NOT_ALLOW(405,"请求方法不被允许"),
+    REQUEST_FORMAT(406,"请求的格式不可得"),
+    TOKEN_EXPIRED(410, "访问令牌已过期", "Token Expired"),
+    USER_NOT_FOUND(411, "用户不存在"),
+    USERPASSWORD_NOT_BLANK(412, "用户名密码不正确"),
+    HOSPITAL_NOT_FOUND(413, "医院不存在,请检查链接"),
+    USER_NOT_SYS(414, "用户没有系统权限"),
+    USER_ADD_EXCEPTION(422,"当创建一个对象时,发生一个验证错误"),
+    SERVER_ERROR(500,"服务器异常"),
+    GATEWAY_ERROR(502,"网关错误"),
+    SERVICE_NOT_USE(503,"服务不可用"),
+    GATEWAY_TIMEOUT(504,"网关超时"),
+    ERROR(999, "系统异常", "System Exception");
+
+    private final Integer code;
+    private final String message;
+    private String enMessage = "";
+
+    private ResultCodeEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    private ResultCodeEnum(Integer code, String message, String enMessage) {
+        this.code = code;
+        this.message = message;
+        this.enMessage = enMessage;
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+
+    public String getEnMessage() {
+        return this.enMessage;
+    }
+}

+ 96 - 0
src/main/java/com/kcim/enums/WeekEnum.java

@@ -0,0 +1,96 @@
+package com.kcim.enums;
+
+/**
+ * 星期一 ~ 星期日
+ *
+ * @author lys
+ * @ClassName: WeekEnum
+ * @Description: (这里用一句话描述这个类的作用)
+ * @date 2015年3月5日 下午1:47:27
+ */
+public enum WeekEnum {
+
+    /**
+     * 星期一
+     */
+    MONDAY("星期一", "Monday", "Mon.", 1),
+    /**
+     * 星期二
+     */
+    TUESDAY("星期二", "Tuesday", "Tues.", 2),
+    /**
+     * 星期三
+     */
+    WEDNESDAY("星期三", "Wednesday", "Wed.", 3),
+    /**
+     * 星期四
+     */
+    THURSDAY("星期四", "Thursday", "Thur.", 4),
+    /**
+     * 星期五
+     */
+    FRIDAY("星期五", "Friday", "Fri.", 5),
+    /**
+     * 星期六
+     */
+    SATURDAY("星期六", "Saturday", "Sat.", 6),
+    /**
+     * 星期日
+     */
+    SUNDAY("星期日", "Sunday", "Sun.", 7);
+
+    private String name_cn;
+    private String name_en;
+    private String name_enShort;
+    private int number;
+
+    private WeekEnum(String name_cn, String name_en, String name_enShort, int number) {
+        this.name_cn = name_cn;
+        this.name_en = name_en;
+        this.name_enShort = name_enShort;
+        this.number = number;
+    }
+
+    /**
+     * 中文名获取
+     *
+     * @return
+     * @Title: getChineseName
+     * @Description: (这里用一句话描述这个方法的作用)
+     * @date 2015年3月5日 下午1:48:13
+     * @author lys
+     */
+    public String getChineseName() {
+        return name_cn;
+    }
+
+    public String getName() {
+        return name_en;
+    }
+
+    /**
+     * 英文名获取
+     *
+     * @return
+     * @Title: getShortName
+     * @Description: (这里用一句话描述这个方法的作用)
+     * @date 2015年3月5日 下午1:48:31
+     * @author lys
+     */
+    public String getShortName() {
+        return name_enShort;
+    }
+
+    /**
+     * 编号获取
+     *
+     * @return
+     * @Title: getNumber
+     * @Description: (这里用一句话描述这个方法的作用)
+     * @date 2015年3月5日 下午1:48:41
+     * @author lys
+     */
+    public int getNumber() {
+        return number;
+    }
+}

+ 1 - 1
src/main/java/com/example/demo/nacosdiscovery/NacosDiscoveryConfiguration.java → src/main/java/com/kcim/nacosdiscovery/NacosDiscoveryConfiguration.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.example.demo.nacosdiscovery;
+package com.kcim.nacosdiscovery;
 
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Configuration;

+ 2 - 2
src/main/java/com/example/demo/service/DemoService.java → src/main/java/com/kcim/service/DemoService.java

@@ -1,6 +1,6 @@
-package com.example.demo.service;
+package com.kcim.service;
 
-import com.example.demo.dao.model.Test;
+import com.kcim.dao.model.Test;
 
 /**
  * @program: center-parent

+ 8 - 8
src/main/java/com/example/demo/service/impl/DemoServiceImpl.java → src/main/java/com/kcim/service/impl/DemoServiceImpl.java

@@ -1,15 +1,15 @@
-package com.example.demo.service.impl;
+package com.kcim.service.impl;
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.example.demo.constants.NumberConstant;
-import com.example.demo.dao.model.Test;
-import com.example.demo.dao.repository.TestRepository;
-import com.example.demo.service.DemoService;
-import com.example.demo.util.BeanUtil;
-import com.example.demo.util.PageUtils;
-import com.example.demo.util.UserContext;
+import com.kcim.constants.NumberConstant;
+import com.kcim.dao.model.Test;
+import com.kcim.dao.repository.TestRepository;
+import com.kcim.service.DemoService;
+import com.kcim.util.BeanUtil;
+import com.kcim.util.PageUtils;
+import com.kcim.util.UserContext;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

+ 1 - 1
src/main/java/com/example/demo/util/AesUtil.java → src/main/java/com/kcim/util/AesUtil.java

@@ -1,4 +1,4 @@
-package com.example.demo.util;
+package com.kcim.util;
 
 import org.apache.commons.codec.binary.Base64;
 

+ 1 - 1
src/main/java/com/example/demo/util/BeanUtil.java → src/main/java/com/kcim/util/BeanUtil.java

@@ -1,4 +1,4 @@
-package com.example.demo.util;
+package com.kcim.util;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;

+ 1 - 1
src/main/java/com/example/demo/util/CommonUtil.java → src/main/java/com/kcim/util/CommonUtil.java

@@ -1,4 +1,4 @@
-package com.example.demo.util;
+package com.kcim.util;
 
 /**
  * 通用工具类

+ 3 - 3
src/main/java/com/example/demo/util/DateUtils.java → src/main/java/com/kcim/util/DateUtils.java

@@ -1,7 +1,7 @@
-package com.example.demo.util;
+package com.kcim.util;
 
-import com.kcim.common.enums.DateStyleEnum;
-import com.kcim.common.enums.WeekEnum;
+import com.kcim.enums.DateStyleEnum;
+import com.kcim.enums.WeekEnum;
 import lombok.extern.slf4j.Slf4j;
 
 import java.sql.Timestamp;

+ 1 - 1
src/main/java/com/example/demo/util/ErrorResult.java → src/main/java/com/kcim/util/ErrorResult.java

@@ -1,4 +1,4 @@
-package com.example.demo.util;
+package com.kcim.util;
 
 
 import com.fasterxml.jackson.annotation.JsonInclude;

+ 1 - 1
src/main/java/com/example/demo/util/JacksonUtil.java → src/main/java/com/kcim/util/JacksonUtil.java

@@ -1,4 +1,4 @@
-package com.example.demo.util;
+package com.kcim.util;
 
 import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.annotation.JsonInclude;

+ 1 - 1
src/main/java/com/example/demo/util/PageUtils.java → src/main/java/com/kcim/util/PageUtils.java

@@ -1,4 +1,4 @@
-package com.example.demo.util;
+package com.kcim.util;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.annotation.JsonInclude;

+ 1 - 1
src/main/java/com/example/demo/util/RedisLock.java → src/main/java/com/kcim/util/RedisLock.java

@@ -1,4 +1,4 @@
-package com.example.demo.util;
+package com.kcim.util;
 
 import cn.hutool.core.util.StrUtil;
 import org.springframework.data.redis.core.StringRedisTemplate;

+ 2 - 2
src/main/java/com/example/demo/util/Result.java → src/main/java/com/kcim/util/Result.java

@@ -1,8 +1,8 @@
-package com.example.demo.util;
+package com.kcim.util;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.kcim.common.enums.ResultCodeEnum;
+import com.kcim.enums.ResultCodeEnum;
 
 /**
  * 统一封装返回对象

+ 1 - 1
src/main/java/com/example/demo/util/SnowflakeUtil.java → src/main/java/com/kcim/util/SnowflakeUtil.java

@@ -1,4 +1,4 @@
-package com.example.demo.util;
+package com.kcim.util;
 
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;

+ 1 - 1
src/main/java/com/example/demo/util/ThreadUtil.java → src/main/java/com/kcim/util/ThreadUtil.java

@@ -1,4 +1,4 @@
-package com.example.demo.util;
+package com.kcim.util;
 
 
 import lombok.extern.slf4j.Slf4j;

+ 3 - 4
src/main/java/com/example/demo/util/UserContext.java → src/main/java/com/kcim/util/UserContext.java

@@ -1,7 +1,7 @@
-package com.example.demo.util;
+package com.kcim.util;
 
 import cn.dev33.satoken.stp.StpUtil;
-import com.example.demo.vo.SessionUserVO;
+import com.kcim.vo.SessionUserVO;
 
 
 /**
@@ -22,8 +22,7 @@ public class UserContext {
      * 获取当前用户所登录的医院id
      */
     public static Long getCurrentLoginHospId() {
-        SessionUserVO user = (SessionUserVO) StpUtil.getSession().get(USER_PREFIX + StpUtil.getLoginId());
-        return user.getHospId();
+        return getHospId();
     }
 
     public static Long getHospId() {

+ 1 - 1
src/main/java/com/example/demo/vo/SessionUserVO.java → src/main/java/com/kcim/vo/SessionUserVO.java

@@ -1,4 +1,4 @@
-package com.example.demo.vo;
+package com.kcim.vo;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;

+ 4 - 2
src/main/resources/application.yml

@@ -26,8 +26,10 @@ spring:
       discovery:
         service: ${spring.application.name}
         server-addr: 120.27.235.181:8848
-        namespace: 38b4fbe9-4a20-48c3-a8bf-ebf069fb26e8
-        group: KCIM
+#        namespace: 38b4fbe9-4a20-48c3-a8bf-ebf069fb26e8
+#        group: KCIM
+        namespace: 060cc0fe-193f-4a94-bbca-6d48a4f95ac2
+        group: dev
     sentinel:
       enabled: true
       transport: