孟超更改

hs-admin/src/main/java/com/hs/admin/controller/LoginController.java

@@ -36,6 +36,7 @@ public class LoginController {
         if(loginInfo.getUser() != null && !loginInfo.getUser().getIsAdmin()){
             return Result.error(Result.ErrorCode.NO_PERMISSION.getCnMessage());
         }
+
         return Result.success(loginInfo);
     }
 

hs-admin/src/main/java/com/hs/admin/controller/UserController.java

@@ -133,4 +133,12 @@ public class UserController {
         return Result.success(sysMenuList);
     }
 
+    @PostMapping("configbhrq")
+    @Token
+    @ApiOperation("设置病案日期")
+    public Object setconfigbhrq(@RequestBody UserReq.SysconfigReq state) throws Exception {
+        boolean updateresult = userService.updateSysconfig(state.getSate());
+        return Result.success(updateresult);
+    }
+
 }

hs-admin/src/main/java/com/hs/admin/mapper/SysUserMapper.java

@@ -24,4 +24,9 @@ public interface SysUserMapper {
     List<SysUserList> selectUserListByPage();
 
     SysUserList selectUserById(@Param("id") Integer id);
+
+    int updateconfig(@Param("state")  String state);
+
+    String selectpwdcontol();
+
 }
\ No newline at end of file

hs-admin/src/main/java/com/hs/admin/model/SysUser.java

@@ -41,6 +41,11 @@ public class SysUser {
 
     private boolean lockFlag;
 
+
+    private boolean isLeader;
+
+    private boolean isRoleylz;
+
     public Integer getId() {
         return id;
     }
@@ -184,4 +189,23 @@ public class SysUser {
     public void setLockFlag(boolean lockFlag) {
         this.lockFlag = lockFlag;
     }
+
+
+
+    public boolean getIsLeader() {
+        return isLeader;
+    }
+
+    public void setIsLeader(boolean isLeader) {
+        this.isLeader = isLeader;
+    }
+
+    public boolean getIsRoleylz() {
+        return isRoleylz;
+    }
+
+    public void setIsRoleylz(boolean isRoleylz) {
+        this.isRoleylz = isRoleylz;
+    }
+
 }
\ No newline at end of file

hs-admin/src/main/java/com/hs/admin/model/reqmodel/AddUserReq.java

@@ -49,4 +49,31 @@ public class AddUserReq {
     public void setIsAdmin(boolean isAdmin) {
         this.isAdmin = isAdmin;
     }
+
+
+
+    @ApiModelProperty(value = "是否是科室主任", required = true)
+    @NotNull(message = "是否是科室主任 参数必传")
+    private boolean isLeader;
+
+    public boolean getIsLeader() {
+        return isLeader;
+    }
+
+    public void setIsLeader(boolean isLeader) {
+        this.isLeader = isLeader;
+    }
+
+
+    @ApiModelProperty(value = "是否是医疗组组长", required = true)
+    @NotNull(message = "是否是医疗组组长 参数必传")
+    private boolean isRoleylz;
+
+    public boolean getIsRoleylz() {
+        return isRoleylz;
+    }
+
+    public void setIsRoleylz(boolean isRoleylz) {
+        this.isRoleylz = isRoleylz;
+    }
 }

hs-admin/src/main/java/com/hs/admin/model/reqmodel/UpdateUserReq.java

@@ -53,4 +53,30 @@ public class UpdateUserReq {
     public void setIsAdmin(boolean isAdmin) {
         this.isAdmin = isAdmin;
     }
+
+
+    @ApiModelProperty(value = "是否是科室主任", required = true)
+    @NotNull(message = "是否是科室主任 参数必传")
+    private boolean isLeader;
+
+    public boolean getIsLeader() {
+        return isLeader;
+    }
+
+    public void setIsLeader(boolean isLeader) {
+        this.isLeader = isLeader;
+    }
+
+
+    @ApiModelProperty(value = "是否是医疗组组长", required = true)
+    @NotNull(message = "是否是医疗组组长 参数必传")
+    private boolean isRoleylz;
+
+    public boolean getIsRoleylz() {
+        return isRoleylz;
+    }
+
+    public void setIsRoleylz(boolean isRoleylz) {
+        this.isRoleylz = isRoleylz;
+    }
 }

hs-admin/src/main/java/com/hs/admin/model/reqmodel/UserReq.java

@@ -7,6 +7,17 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 public class UserReq {
+    public static class SysconfigReq {
+        private  String state; //add by meng 20210523 配置sysconfig
+        public String getSate() {
+            return state;
+        }
+
+        public void setState(String state) {
+            this.state = state;
+        }
+    }
+
 
     public static class GetUserReq {
         @ApiModelProperty(value = "用户名称", required = true)

hs-admin/src/main/java/com/hs/admin/service/LoginService.java

@@ -23,6 +23,10 @@ public interface LoginService {
         @ApiModelProperty("用户机构信息")
         private List<DicOrg> org;
 
+
+
+        private String passcontolflag;
+
         public LoginInfo() {
         }
 
@@ -56,6 +60,14 @@ public interface LoginService {
             this.org = org;
         }
 
+        public String getPasscontolflag() {
+            return passcontolflag;
+        }
+
+        public void setPasscontolflag(String passcontolflag) {
+            this.passcontolflag = passcontolflag;
+        }
+
         @Override
         public String toString() {
             return "LoginInfo{" +

hs-admin/src/main/java/com/hs/admin/service/UserService.java

@@ -26,4 +26,10 @@ public interface UserService {
     PageResult getAllByPage(UserReq.GetUserReq user);
 
     SysUserList info(Integer userId);
+
+    boolean updateSysconfig(String state);
+
+     String selectpwdcontol() ;
+
+
 }

hs-admin/src/main/java/com/hs/admin/service/impl/LoginServiceImpl.java

@@ -45,6 +45,7 @@ public class LoginServiceImpl implements LoginService {
             //查询用户机构
             List<DicOrg> orgList = dicOrgMapper.selectByUser(user.getId());
             loginInfo.setOrg(orgList);
+            loginInfo.setPasscontolflag(sysUserMapper.selectpwdcontol());  // add by mengchao 20210527  用户的密码是否控制
         }
         return loginInfo;
     }

hs-admin/src/main/java/com/hs/admin/service/impl/UserServiceImpl.java

@@ -58,6 +58,8 @@ public class UserServiceImpl implements UserService {
             sysUser.setCreateUserid(userId);
             sysUser.setState((short) StateType.ON.getValue());
             sysUser.setIsAdmin(user.getIsAdmin());
+            sysUser.setIsRoleylz(user.getIsRoleylz());  //add by mengchao 20210521
+            sysUser.setIsLeader(user.getIsLeader());  //add by mengchao 20210521
             sysUserMapper.insert(sysUser);
 
             //添加角色信息
@@ -112,6 +114,8 @@ public class UserServiceImpl implements UserService {
                 sysUser.setMobile(user.getMobile());
                 sysUser.setSex(user.getSex());
                 sysUser.setIsAdmin(user.getIsAdmin());
+                sysUser.setIsRoleylz(user.getIsRoleylz());  //add by mengchao 20210521
+                sysUser.setIsLeader(user.getIsLeader());  //add by mengchao 20210521
                 sysUserMapper.updateByPrimaryKey(sysUser);
 
                 //修改角色信息
@@ -159,6 +163,18 @@ public class UserServiceImpl implements UserService {
         /*sysUser.setPassword(AESUtil.encrypt(sysUser.getPassword()));*/
         return sysUser;
     }
+    @Override
+    public boolean updateSysconfig(String state) {
+        if (sysUserMapper.updateconfig(state)>0 ) {
+                          return true;
+            }
 
+        return false;
+    }
+
+    @Override
+    public String selectpwdcontol() {
+        return sysUserMapper.selectpwdcontol();
+    }
 
 }

hs-admin/src/main/resources/application-dev.properties

 #### \u5F00\u53D1\u73AF\u5883 ###################################################
-spring.datasource.url=jdbc:mysql://192.168.18.176:3306/scml_zp_cs?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
+spring.datasource.url=jdbc:mysql://192.168.31.211:3306/scml_ptrm_test3.1?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
 spring.datasource.username=root
-spring.datasource.password=Suvalue2016
+spring.datasource.password=password
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA40\uFF09
 spring.redis.database=0
-spring.redis.host=192.168.18.169
-spring.redis.port=6379
-spring.redis.password=ll123456
+spring.redis.host=127.0.0.1
+spring.redis.port=7379
+spring.redis.password=123456
 spring.redis.jedis.pool.max-active=8
 # \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.jedis.pool.max-wait=-1

hs-admin/src/main/resources/application.properties

 spring.application.name=bsoftadmin
-spring.profiles.active=test
-#server.port=8080
-#server.servlet.context-path=/api
+spring.profiles.active=dev
+server.port=8088
+server.servlet.context-path=/admin
 mybatis.mapper-locations=classpath:mapper/*.xml
 mybatis.type-aliases-package=com.hs.admin.model
 

hs-admin/src/main/resources/mapper/SysUserMapper.xml

@@ -20,6 +20,8 @@
         <result column="LAST_IP" jdbcType="VARCHAR" property="lastIp"/>
         <result column="IS_ADMIN" jdbcType="BOOLEAN" property="isAdmin"/>
         <result column="LOCK_FLAG" jdbcType="BOOLEAN" property="lockFlag"/>
+        <result column="ROLE_YLZ" jdbcType="VARCHAR" property="isRoleylz"/>
+        <result column="IS_LEADER" jdbcType="BOOLEAN" property="isLeader"/>
     </resultMap>
     <resultMap id="SysUserList" extends="BaseResultMap" type="com.hs.admin.model.respmodel.SysUserList">
         <result column="ROLE_ID" jdbcType="INTEGER" property="roleId"/>
@@ -40,12 +42,12 @@
         USER_CODE, USER_NAME, `PASSWORD`,
         IDCARD, SEX, MOBILE,
         PAGE_COUNT, ERROR_COUNT, ERROR_TIME,LAST_UPDATE_PWD_TIME,
-        LAST_TIME, LAST_IP,MAC_ADDRESS,IS_ADMIN)
+        LAST_TIME, LAST_IP,MAC_ADDRESS,IS_ADMIN,ROLE_YLZ,IS_LEADER)
         values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
         #{userCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR},
         #{idcard,jdbcType=VARCHAR}, #{sex,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR},
         #{pageCount,jdbcType=DECIMAL}, #{errorCount,jdbcType=DECIMAL}, #{errorTime,jdbcType=TIMESTAMP}, #{lastUpdatePwdTime,jdbcType=TIMESTAMP},
-        #{lastTime,jdbcType=TIMESTAMP}, #{lastIp,jdbcType=VARCHAR},'EO-D5-5E-6C-4D-7B',#{isAdmin,jdbcType=BOOLEAN})
+        #{lastTime,jdbcType=TIMESTAMP}, #{lastIp,jdbcType=VARCHAR},'EO-D5-5E-6C-4D-7B',#{isAdmin,jdbcType=BOOLEAN},#{isRoleylz,jdbcType=BOOLEAN},#{isLeader,jdbcType=BOOLEAN})
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.hs.admin.model.SysUser">
         update sys_user
@@ -65,6 +67,8 @@
             LAST_TIME     = #{lastTime,jdbcType=TIMESTAMP},
             LAST_IP       = #{lastIp,jdbcType=VARCHAR},
             IS_ADMIN       = #{isAdmin,jdbcType=VARCHAR},
+            IS_LEADER       = #{isLeader,jdbcType=VARCHAR},
+            ROLE_YLZ       = #{isRoleylz,jdbcType=VARCHAR},
             LOCK_FLAG       = #{lockFlag,jdbcType=VARCHAR}
         where ID = #{id,jdbcType=INTEGER}
     </update>
@@ -124,7 +128,9 @@
                LAST_UPDATE_PWD_TIME,
                LAST_TIME,
                LAST_IP,
-               IS_ADMIN
+               IS_ADMIN,
+               ROLE_YLZ,
+               IS_LEADER
         from SYS_USER
         where USER_CODE = #{userCode,jdbcType=VARCHAR}
           and `STATE` != 0
@@ -149,4 +155,16 @@
         where u.id = #{id}
         group by u.id
     </select>
+
+    <update id="updateconfig"  >
+        update sys_config
+        set state   = #{state,jdbcType=VARCHAR}
+        where `key` = 'BAH_CXRQ_CONTROL'
+    </update>
+
+    <select id="selectpwdcontol" resultType="java.lang.String">
+        select case count(1) when 0 then 1 else 0 end
+        from sys_config
+        where  `key` = 'PWD_LEN_CONTROL' and state=1
+        </select>
 </mapper>
\ No newline at end of file

hs-admin/src/main/resources/static/index.html

-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=Cache-Control content="no-cache, no-store, must-revalidate"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=1300"><link rel=icon href=./web/favicon.ico><title>大数据医院运营后台管理</title><script src=./web/scripts/jquery.min.js></script><script src=./web/scripts/linq.min.js></script><script src="./web/scripts/file.js?version=1.8.28.2"></script><script src=./web/scripts/echarts.min.js></script><script src=./web/scripts/walden.js></script><script src=./web/scripts/sucharts.min.2019.11.08.js></script><script src=./web/scripts/shim.min.js></script><script src=./web/scripts/xlsx.core.min.js></script><script src=./web/scripts/FileSaver.min.js></script><script src=./web/scripts/clipboard.min.js></script><link href=web/css/chunk-1220897c.bdc032ae.css rel=prefetch><link href=web/css/chunk-a5196180.0e433876.css rel=prefetch><link href=web/js/chunk-1220897c.10c4e9e7.js rel=prefetch><link href=web/js/chunk-2d0a5503.9031d9ee.js rel=prefetch><link href=web/js/chunk-2d21ad95.676b54b4.js rel=prefetch><link href=web/js/chunk-2d224c43.e946cfc1.js rel=prefetch><link href=web/js/chunk-a5196180.3f30abf3.js rel=prefetch><link href=web/css/app.3d25b637.css rel=preload as=style><link href=web/css/chunk-vendors.2a56b552.css rel=preload as=style><link href=web/js/app.a002290c.js rel=preload as=script><link href=web/js/chunk-vendors.e4ebf5f6.js rel=preload as=script><link href=web/css/chunk-vendors.2a56b552.css rel=stylesheet><link href=web/css/app.3d25b637.css rel=stylesheet></head><body><noscript><strong>We're sorry but temp_vue3 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=web/js/chunk-vendors.e4ebf5f6.js></script><script src=web/js/app.a002290c.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=Cache-Control content="no-cache, no-store, must-revalidate"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=1300"><link rel=icon href=./web/favicon.ico><title>大数据医院运营后台管理</title><script src=./web/scripts/jquery.min.js></script><script src=./web/scripts/linq.min.js></script><script src="./web/scripts/file.js?version=1.8.28.2"></script><script src=./web/scripts/echarts.min.js></script><script src=./web/scripts/walden.js></script><script src=./web/scripts/sucharts.min.2019.11.08.js></script><script src=./web/scripts/shim.min.js></script><script src=./web/scripts/xlsx.core.min.js></script><script src=./web/scripts/FileSaver.min.js></script><script src=./web/scripts/clipboard.min.js></script><link href=web/css/chunk-1220897c.b33bd864.css rel=prefetch><link href=web/css/chunk-6345b4e2.306b428b.css rel=prefetch><link href=web/css/chunk-a5196180.0e433876.css rel=prefetch><link href=web/js/chunk-057e686a.16ef8a1c.js rel=prefetch><link href=web/js/chunk-1220897c.ae393ef3.js rel=prefetch><link href=web/js/chunk-2d0a5503.6b59b31e.js rel=prefetch><link href=web/js/chunk-2d224c43.9e3ac1bb.js rel=prefetch><link href=web/js/chunk-6345b4e2.c5eed699.js rel=prefetch><link href=web/js/chunk-a5196180.c3161bb8.js rel=prefetch><link href=web/css/app.b393d3da.css rel=preload as=style><link href=web/css/chunk-vendors.2a56b552.css rel=preload as=style><link href=web/js/app.cd39f7c5.js rel=preload as=script><link href=web/js/chunk-vendors.d9e63305.js rel=preload as=script><link href=web/css/chunk-vendors.2a56b552.css rel=stylesheet><link href=web/css/app.b393d3da.css rel=stylesheet></head><body><noscript><strong>We're sorry but temp_vue3 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=web/js/chunk-vendors.d9e63305.js></script><script src=web/js/app.cd39f7c5.js></script></body></html>
\ No newline at end of file

hs-admin/src/main/resources/static/web/scripts/file.js

 //最终API域名
-var domain = "/admin";
+//开发环境API域名
+  var domain = "/admin";
+// 生产环境API域名
+   var  path = window.location.href;
+  var root =path.substring(30,path.substr(1).indexOf('#')-10);
+  //var domain = "/"+root;
 
-//
 var baseParams = {
-    appname: "manager"
+    
 };
 
 

hs-api/src/main/java/com/hs/api/common/enums/SysConfigKeyType.java

@@ -11,8 +11,10 @@ public enum SysConfigKeyType {
     MAC_BINDING("MAC_BINDING","MAC地址绑定"),
     PWD_TIME_LIMIT("PWD_TIME_LIMIT","密码有效期"),
     SIMULTAN_ONLINE_NUM("SIMULTAN_ONLINE_NUM","密码有效期"),
+    BAH_CXRQ_CONTROL("BAH_CXRQ_CONTROL","是否检查发布功能"),
     LOGIN_ERROR_TIMES("LOGIN_ERROR_TIMES","登录失败次数限制");
 
+
     private String code;
     private String desc;
 

hs-api/src/main/java/com/hs/api/mapper/SysUserMapper.java

@@ -4,6 +4,7 @@ import com.hs.api.model.SysUser;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface SysUserMapper {
     int deleteByPrimaryKey(Long id);
@@ -19,4 +20,18 @@ public interface SysUserMapper {
     int updateByPrimaryKey(SysUser record);
 
     SysUser selectByCode(@Param("userCode") String loginName);
+
+    String selectBlockCode();
+
+    List<Map<String, Object>>  selectReportecharts();
+
+    List<Map<String, String>>  selectGrouptitleByid(@Param("groupid") String groupid);
+    List<Map<String, Object>>  selectGroupdataByid(@Param("groupid") String groupid);
+    List<Map<String, String>>  selectDatatitleByid(@Param("groupdataid") String groupdataid);
+
+    List<Map<String, String>>  getdatacontentlist(@Param("datasourcesql") String datasourcesql);
+
+
+
+
 }
\ No newline at end of file

hs-api/src/main/java/com/hs/api/mapper/SysVersionMapper.java

@@ -16,4 +16,6 @@ public interface SysVersionMapper {
     int updateByPrimaryKey(SysVersion record);
 
     SysVersion selectLastDate();
+
+    int selectConfigCount();
 }
\ No newline at end of file

hs-api/src/main/java/com/hs/api/model/SysUser.java

@@ -40,6 +40,10 @@ public class SysUser {
     private boolean lockFlag;
 
     private boolean pwdInit;
+    private String roleYlz;
+    private boolean isLeader;
+    private boolean isAdmin;
+
 
     public Long getId() {
         return id;
@@ -196,4 +200,29 @@ public class SysUser {
     public void setPwdInit(boolean pwdInit) {
         this.pwdInit = pwdInit;
     }
+
+    public String getRoleYlz() {
+        return roleYlz;
+    }
+
+    public void setRoleYlz(String roleYlz) {
+        this.roleYlz = roleYlz;
+    }
+
+    public boolean getIsLeader() {
+        return isLeader;
+    }
+
+    public void setIsLeader(boolean isLeader) {
+        this.isLeader = isLeader;
+    }
+
+    public boolean getIsAdmin() {
+        return isAdmin;
+    }
+
+    public void setIsAdmin(boolean isAdmin) {
+        this.isAdmin = isAdmin;
+    }
+
 }
\ No newline at end of file

hs-api/src/main/java/com/hs/api/service/Impl/LoginServiceImpl.java

@@ -94,6 +94,12 @@ public class LoginServiceImpl implements LoginService {
 
             //查询病案信息
             SysVersion version = sysVersionMapper.selectLastDate();
+            //add 检查发布功能  by mengchao 2021-05-24 begin
+            if(sysConfigService.getStateByKey(SysConfigKeyType.BAH_CXRQ_CONTROL.getCode()) && !user.getIsAdmin())
+            {
+                version.setBahDate(version.getBahDate()-1);
+            }
+            // add end
             loginInfo.setVersion(version);
             RedisUtil.del(user.getUserCode());
         } else {

hs-api/src/main/java/com/hs/api/service/Impl/UserServiceImpl.java

@@ -12,6 +12,7 @@ import javax.annotation.Resource;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Service
@@ -54,4 +55,30 @@ public class UserServiceImpl implements UserService {
         });
         return count.intValue();
     }
+
+
+    public String selectBlockCode() {
+        String selectcode=sysUserMapper.selectBlockCode();
+        return selectcode;
+    }
+
+    public  List<Map<String, Object>>  selectReportEchart() {
+        return sysUserMapper.selectReportecharts();
+    }
+
+    public  List<Map<String, String>>  selectGrouptitleByid(String groupid) {
+        return sysUserMapper.selectGrouptitleByid(groupid);
+    }
+    public  List<Map<String, Object>>  selectGroupdataByid(String groupid) {
+        return sysUserMapper.selectGroupdataByid(groupid);
+    }
+    public  List<Map<String, String>>  selectDatatitleByid(String groupdataid) {
+        return sysUserMapper.selectDatatitleByid(groupdataid);
+    }
+
+
+    public  List<Map<String, String>>  getdatacontentlist(String datasourcesql) {
+        return sysUserMapper.getdatacontentlist(datasourcesql);
+    }
+
 }

hs-api/src/main/java/com/hs/api/service/UserService.java

@@ -2,6 +2,9 @@ package com.hs.api.service;
 
 import com.hs.api.model.SysUser;
 
+import java.util.List;
+import java.util.Map;
+
 public interface UserService {
     SysUser findByLoginName(String loginName);
 
@@ -10,4 +13,16 @@ public interface UserService {
     SysUser findById(Long id);
 
     int init();
+   String selectBlockCode( );
+
+    List<Map<String, Object>> selectReportEchart( );
+
+    List<Map<String, String>> selectGrouptitleByid(String groupid );
+    List<Map<String, Object>> selectGroupdataByid(String groupid );
+
+    List<Map<String, String>> selectDatatitleByid(String groupdataid );
+
+    List<Map<String, String>> getdatacontentlist(String datasourcesql );
+
+
 }

hs-api/src/main/resources/application-dev.properties

 #### \u5F00\u53D1\u73AF\u5883 ###################################################
-spring.datasource.url=jdbc:mysql://192.168.18.176:3306/scml_zp_cs?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/scml_ptrm_test?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
+spring.datasource.url=jdbc:mysql://192.168.31.211:3306/scml_ptrm_test3.1?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
+
 spring.datasource.username=root
-spring.datasource.password=Suvalue2016
+spring.datasource.password=password
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 #spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
@@ -11,9 +13,9 @@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA40\uFF09
 spring.redis.database=1
-spring.redis.host=192.168.18.169
-spring.redis.port=6379
-spring.redis.password=ll123456
+spring.redis.host=127.0.0.1
+spring.redis.port=7379
+spring.redis.password=123456
 spring.redis.jedis.pool.max-active=8
 # \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
 spring.redis.jedis.pool.max-wait=-1

hs-api/src/main/resources/application.properties

 spring.application.name=hs
-spring.profiles.active=test
+spring.profiles.active=dev
 
 mybatis.mapper-locations=classpath:mapper/*.xml
 mybatis.type-aliases-package=com.hs.api.model

hs-api/src/main/resources/mapper/SysUserMapper.xml

@@ -21,6 +21,9 @@
         <result column="LAST_UPDATE_PWD_TIME" jdbcType="TIMESTAMP" property="lastUpdatePwdTime"/>
         <result column="LOCK_FLAG" jdbcType="BOOLEAN" property="lockFlag"/>
         <result column="PWD_INIT" jdbcType="BOOLEAN" property="pwdInit"/>
+        <result column="ROLE_YLZ" jdbcType="VARCHAR" property="roleYlz"/>
+        <result column="IS_LEADER" jdbcType="BOOLEAN" property="isLeader"/>
+        <result column="IS_ADMIN" jdbcType="BOOLEAN" property="isAdmin"/>
     </resultMap>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete
@@ -126,9 +129,50 @@
                MAC_ADDRESS,
                LAST_UPDATE_PWD_TIME,
                LOCK_FLAG,
-               PWD_INIT
+               PWD_INIT,
+               ROLE_YLZ,
+               IS_LEADER,
+               IS_ADMIN
         from SYS_USER
         where USER_CODE = #{userCode,jdbcType=VARCHAR}
           and `STATE` != 0
     </select>
+
+    <select id="selectBlockCode" resultType="java.lang.String">
+        select reprort_block_code from cms.base_report_echart_config brec  where id=1
+    </select>
+
+    <select id="selectReportecharts" resultType="java.util.Map">
+         select * from reportechart r where state='1'
+    </select>
+    <select id="selectGrouptitleByid" resultType="java.util.Map">
+          select * from grouptitle aa,group_title_rs bb
+          where bb.group_id=#{groupid}
+          and bb.grouptitle_id=aa.grouptitle_id
+          order by sort
+
+    </select>
+    <select id="selectGroupdataByid" resultType="java.util.Map">
+          select * from groupdata aa ,group_data_rs bb
+    where aa.groupdata_id =bb.groupdata_id
+    and bb.group_id=#{groupid}
+    order by sort
+
+    </select>
+    <select id="selectDatatitleByid" resultType="java.util.Map">
+     select * from data_title_rs aa,datatitle bb
+    where aa.datatitle_id =bb.datatitle_id
+    and aa.groupdata_id =#{groupdataid}
+    order by sort
+
+    </select>
+
+    <select id="getdatacontentlist" resultType="java.util.Map">
+        select * from ( ${datasourcesql} ) datatable
+        /*select * from ( select time as month,cmi,cmi_tbl from val_block_values_1_1_1 vbv where time &gt;=concat(substr(202102,1,4),'01') and time &lt;=202102
+        ) datacontent*/
+    </select>
+
+
+
 </mapper>
\ No newline at end of file

hs-api/src/main/resources/mapper/SysVersionMapper.xml

@@ -45,4 +45,9 @@
         order by UPDATE_TIME desc, BAH_DATE desc
         limit 0,1
     </select>
+
+    <select id="selectConfigCount" resultType="java.lang.Integer">
+       select count(1) from sys_config a where a.key='BAH_CXRQ_CONTROL' and state=1
+    </select>
+
 </mapper>
\ No newline at end of file