Merge branch 'release' into dev-132

server/src/main/java/com/pica/cloud/account/account/server/Test.java

@@ -5,6 +5,10 @@ import com.pica.cloud.account.account.server.entity.EncryptEntity;
 import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.RSAUtil;
+import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
+import com.pica.cloud.foundation.encryption.util.EncryptUtils;
+
+import java.util.ArrayList;
 
 
 public class Test {
@@ -102,8 +106,8 @@ public class Test {
 
         System.out.println("--------------------获取验证码接口-------------");
         BaseRequest authCode = new BaseRequest();
-        authCode.setFlag(3);
-        authCode.setMobile("13024112588");
+        authCode.setFlag(4);
+        authCode.setMobile("13024112688");
         String authCodeStr = JSONObject.toJSONString(authCode);
         System.out.println(authCodeStr);
         String contentResult2 = AESUtil.aesEncrypt(authCodeStr, "YCPQPx4qpQjEjDea");
@@ -117,9 +121,9 @@ public class Test {
         //获取注册参数
         BaseRequest register = null;
         register = new BaseRequest();
-        register.setMobile("13024112100");
+        register.setMobile("13024112688");
         register.setPassword("D0DCBF0D12A6B1E7FBFA2CE5848F3EFF");
-        register.setAuthCode("654003");
+        register.setAuthCode("113058");
         String registerString3 = JSONObject.toJSONString(register);
         String contentResult3 = AESUtil.aesEncrypt(registerString3, "YCPQPx4qpQjEjDea");
         String keyResult3 = RSAUtil.encrypt("YCPQPx4qpQjEjDea",publicKey);
@@ -167,8 +171,8 @@ public class Test {
         System.out.println("--------------------忘记密码-------------");
         BaseRequest forgetPwd = new BaseRequest();
         forgetPwd.setPassword("0B9A75D6A88721A4BCF94F0FD668C56B");
-        forgetPwd.setMobile("13024112092");
-        forgetPwd.setAuthCode("095502");
+        forgetPwd.setMobile("13024112688");
+        forgetPwd.setAuthCode("997736");
         String changePwdStr9 = JSONObject.toJSONString(forgetPwd);
         System.out.println(changePwdStr9);
         String contentResult9 = AESUtil.aesEncrypt(changePwdStr9, "YCPQPx4qpQjEjDea");
@@ -191,10 +195,11 @@ public class Test {
         changeMobileEntity.setKey(changeMobileKey);
         changeMobileEntity.setContent(changeMobileContent);
         System.out.println(JSONObject.toJSONString(changeMobileEntity));
-    }
 
 
 
+    }
+
 
 
 }

server/src/main/java/com/pica/cloud/account/account/server/controller/AccountController.java

@@ -3,6 +3,7 @@ package com.pica.cloud.account.account.server.controller;
 import com.pica.cloud.account.account.server.entity.Account;
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
 import com.pica.cloud.account.account.server.entity.LoginResult;
+import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.mapper.AccountMapper;
 import com.pica.cloud.account.account.server.req.AccountReq;
 import com.pica.cloud.account.account.server.req.BaseRequest;
@@ -173,7 +174,7 @@ public class AccountController extends AccountBaseController {
                 account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_2);  //ios
                 break;
             default:
-                account.setRegisterSource(7);  //H5注册
+                account.setRegisterSource(AccountTypeEnum.DEVICE_TYPE_H5.getCode());  //H5注册
         }
         //创建账号
         accountService.createAccount(account);
@@ -309,44 +310,44 @@ public class AccountController extends AccountBaseController {
      * @param req
      * @return
      */
-    @ApiOperation("H5端一键登录功能,无需完善信息 旧接口")
-    @PostMapping("/login-register")
-    public PicaResponse<String> loginRegister(@RequestBody AccountReq req) {
-        this.checkMobilePhone(req.getMobilePhone());
-        req.setPassword(null);  //登录或注册，只能使用验证码
-
-        //判断账号是否已经存在
-        Account account = accountService.getByMobilePhone(req.getMobilePhone());
-        if (account != null) {
-            return this.login(req);  //登录
-        } else {
-            return this.registerOld(req);  //注册
-        }
-    }
-
-    public PicaResponse<String> registerOld(@RequestBody AccountReq req) {
-        this.checkMobilePhone(req.getMobilePhone());
-        this.checkAuthCode(req);
-        String deviceType = super.getDeviceInfo("device_type");  //1:pc 2:android 3:ios
-        Account account = new Account();
-        account.setMobilePhone(EncryptUtils.encryptContent(req.getMobilePhone(), EncryptConstants.ENCRYPT_TYPE_MOBILE));
-        switch (deviceType) {  //注册来源
-            case "1":
-                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_3);  //pc
-                break;
-            case "2":
-                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_1);  //android
-                break;
-            case "3":
-                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_2);  //ios
-                break;
-            default:
-                account.setRegisterSource(7);  //H5注册
-        }
-        //创建账号
-        accountService.createAccount(account);
-        //生成token并返回
-        String newToken = this.generateToken(account, deviceType);
-        return PicaResponse.toResponse(newToken);
-    }
+//    @ApiOperation("H5端一键登录功能,无需完善信息 旧接口")
+//    @PostMapping("/login-register")
+//    public PicaResponse<String> loginRegister(@RequestBody AccountReq req) {
+//        this.checkMobilePhone(req.getMobilePhone());
+//        req.setPassword(null);  //登录或注册，只能使用验证码
+//
+//        //判断账号是否已经存在
+//        Account account = accountService.getByMobilePhone(req.getMobilePhone());
+//        if (account != null) {
+//            return this.login(req);  //登录
+//        } else {
+//            return this.registerOld(req);  //注册
+//        }
+//    }
+
+//    public PicaResponse<String> registerOld(@RequestBody AccountReq req) {
+//        this.checkMobilePhone(req.getMobilePhone());
+//        this.checkAuthCode(req);
+//        String deviceType = super.getDeviceInfo("device_type");  //1:pc 2:android 3:ios
+//        Account account = new Account();
+//        account.setMobilePhone(EncryptUtils.encryptContent(req.getMobilePhone(), EncryptConstants.ENCRYPT_TYPE_MOBILE));
+//        switch (deviceType) {  //注册来源
+//            case "1":
+//                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_3);  //pc
+//                break;
+//            case "2":
+//                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_1);  //android
+//                break;
+//            case "3":
+//                account.setRegisterSource(CommonConstants.SYSTEM_TYPE_P024_NO_2);  //ios
+//                break;
+//            default:
+//                account.setRegisterSource(4);  //H5注册
+//        }
+//        //创建账号
+//        accountService.createAccount(account);
+//        //生成token并返回
+//        String newToken = this.generateToken(account, deviceType);
+//        return PicaResponse.toResponse(newToken);
+//    }
 }

server/src/main/java/com/pica/cloud/account/account/server/controller/DoctorController.java

@@ -48,7 +48,7 @@ public class DoctorController extends AccountBaseController {
     @ApiOperation("修改医生信息接口")
     @PutMapping(value = "/info", produces = "application/json;charset=utf-8")
     public PicaResponse modifyDoctorInfo(@RequestBody Doctor doctor) {
-        doctorService.modifyDoctorInfo(doctor);
+        doctorService.modifyDoctorInfo(doctor,super.getDoctorIdByToken());
         return PicaResponse.toResponse();
     }
 
@@ -64,7 +64,7 @@ public class DoctorController extends AccountBaseController {
         if (doctor != null && doctor.getMobilePhone() != null) {
             AccountUtils.checkMobilePhone(doctor.getMobilePhone());
             AccountUtils.checkPassword(doctor.getPassword());
-            Integer userId = doctorService.addDoctorInfo(doctor);
+            Integer userId = doctorService.addDoctorInfo(doctor,super.getDoctorIdByToken());
             return PicaResponse.toResponse(userId);
         } else {
             throw new AccountException(AccountExceptionEnum.PICA_PARAMS_ERROR);
@@ -75,7 +75,7 @@ public class DoctorController extends AccountBaseController {
     @ApiOperation("客服系统删除医生信息")
     @DeleteMapping(value = "/delete/{id}")
     public PicaResponse deleteDoctor(@PathVariable("id") Integer id) {
-        doctorService.deleteDoctorInfo(id);
+        doctorService.deleteDoctorInfo(id,super.getDoctorIdByToken());
         return PicaResponse.toResponse();
     }
 }

server/src/main/java/com/pica/cloud/account/account/server/entity/Hospital.java

+package com.pica.cloud.account.account.server.entity;
+
+import java.util.Date;
+
+public class Hospital {
+    private Integer id;
+
+    private Integer provinceId;
+
+    private String provinceName;
+
+    private Long cityId;
+
+    private String cityName;
+
+    private Long countyId;
+
+    private String countyName;
+
+    private Long townId;
+
+    private String townName;
+
+    private Long villageId;
+
+    private String villageName;
+
+    private String name;
+
+    private String hospitalAddress;
+
+    private Integer type;
+
+    private Integer orgType;
+
+    private Integer levelGrade;
+
+    private String contacts;
+
+    private String tel;
+
+    private Integer sourceType;
+
+    private Integer enable;
+
+    private Integer deleteFlag;
+
+    private Integer creatId;
+
+    private Date creatTime;
+
+    private Integer modifyId;
+
+    private Date modifyTime;
+
+    private Integer hospitalStatisticsType;
+
+    private Integer hospitalRank;
+
+    private String hospitalAlias;
+
+    private Integer parentId;
+
+    private String hospitalClass;
+
+    private String hospitalLevel;
+
+    private String hospitalGrade;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(Integer provinceId) {
+        this.provinceId = provinceId;
+    }
+
+    public String getProvinceName() {
+        return provinceName;
+    }
+
+    public void setProvinceName(String provinceName) {
+        this.provinceName = provinceName == null ? null : provinceName.trim();
+    }
+
+    public Long getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(Long cityId) {
+        this.cityId = cityId;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName == null ? null : cityName.trim();
+    }
+
+    public Long getCountyId() {
+        return countyId;
+    }
+
+    public void setCountyId(Long countyId) {
+        this.countyId = countyId;
+    }
+
+    public String getCountyName() {
+        return countyName;
+    }
+
+    public void setCountyName(String countyName) {
+        this.countyName = countyName == null ? null : countyName.trim();
+    }
+
+    public Long getTownId() {
+        return townId;
+    }
+
+    public void setTownId(Long townId) {
+        this.townId = townId;
+    }
+
+    public String getTownName() {
+        return townName;
+    }
+
+    public void setTownName(String townName) {
+        this.townName = townName == null ? null : townName.trim();
+    }
+
+    public Long getVillageId() {
+        return villageId;
+    }
+
+    public void setVillageId(Long villageId) {
+        this.villageId = villageId;
+    }
+
+    public String getVillageName() {
+        return villageName;
+    }
+
+    public void setVillageName(String villageName) {
+        this.villageName = villageName == null ? null : villageName.trim();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public String getHospitalAddress() {
+        return hospitalAddress;
+    }
+
+    public void setHospitalAddress(String hospitalAddress) {
+        this.hospitalAddress = hospitalAddress == null ? null : hospitalAddress.trim();
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getOrgType() {
+        return orgType;
+    }
+
+    public void setOrgType(Integer orgType) {
+        this.orgType = orgType;
+    }
+
+    public Integer getLevelGrade() {
+        return levelGrade;
+    }
+
+    public void setLevelGrade(Integer levelGrade) {
+        this.levelGrade = levelGrade;
+    }
+
+    public String getContacts() {
+        return contacts;
+    }
+
+    public void setContacts(String contacts) {
+        this.contacts = contacts == null ? null : contacts.trim();
+    }
+
+    public String getTel() {
+        return tel;
+    }
+
+    public void setTel(String tel) {
+        this.tel = tel == null ? null : tel.trim();
+    }
+
+    public Integer getSourceType() {
+        return sourceType;
+    }
+
+    public void setSourceType(Integer sourceType) {
+        this.sourceType = sourceType;
+    }
+
+    public Integer getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Integer enable) {
+        this.enable = enable;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Integer getCreatId() {
+        return creatId;
+    }
+
+    public void setCreatId(Integer creatId) {
+        this.creatId = creatId;
+    }
+
+    public Date getCreatTime() {
+        return creatTime;
+    }
+
+    public void setCreatTime(Date creatTime) {
+        this.creatTime = creatTime;
+    }
+
+    public Integer getModifyId() {
+        return modifyId;
+    }
+
+    public void setModifyId(Integer modifyId) {
+        this.modifyId = modifyId;
+    }
+
+    public Date getModifyTime() {
+        return modifyTime;
+    }
+
+    public void setModifyTime(Date modifyTime) {
+        this.modifyTime = modifyTime;
+    }
+
+    public Integer getHospitalStatisticsType() {
+        return hospitalStatisticsType;
+    }
+
+    public void setHospitalStatisticsType(Integer hospitalStatisticsType) {
+        this.hospitalStatisticsType = hospitalStatisticsType;
+    }
+
+    public Integer getHospitalRank() {
+        return hospitalRank;
+    }
+
+    public void setHospitalRank(Integer hospitalRank) {
+        this.hospitalRank = hospitalRank;
+    }
+
+    public String getHospitalAlias() {
+        return hospitalAlias;
+    }
+
+    public void setHospitalAlias(String hospitalAlias) {
+        this.hospitalAlias = hospitalAlias == null ? null : hospitalAlias.trim();
+    }
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getHospitalClass() {
+        return hospitalClass;
+    }
+
+    public void setHospitalClass(String hospitalClass) {
+        this.hospitalClass = hospitalClass == null ? null : hospitalClass.trim();
+    }
+
+    public String getHospitalLevel() {
+        return hospitalLevel;
+    }
+
+    public void setHospitalLevel(String hospitalLevel) {
+        this.hospitalLevel = hospitalLevel == null ? null : hospitalLevel.trim();
+    }
+
+    public String getHospitalGrade() {
+        return hospitalGrade;
+    }
+
+    public void setHospitalGrade(String hospitalGrade) {
+        this.hospitalGrade = hospitalGrade == null ? null : hospitalGrade.trim();
+    }
+}
\ No newline at end of file

server/src/main/java/com/pica/cloud/account/account/server/entity/PermissionDoctorRole.java

+package com.pica.cloud.account.account.server.entity;
+
+import java.util.Date;
+
+public class PermissionDoctorRole {
+    private Long id;
+
+    private Long doctorId;
+
+    private Long hospitalId;
+
+    private Long roleId;
+
+    private Integer deleteFlag;
+
+    private Long createdId;
+
+    private Date createdTime;
+
+    private Long modifiedId;
+
+    private Date modifiedTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(Long doctorId) {
+        this.doctorId = doctorId;
+    }
+
+    public Long getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Long hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+
+    public Integer getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+
+    public Long getCreatedId() {
+        return createdId;
+    }
+
+    public void setCreatedId(Long createdId) {
+        this.createdId = createdId;
+    }
+
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public Long getModifiedId() {
+        return modifiedId;
+    }
+
+    public void setModifiedId(Long modifiedId) {
+        this.modifiedId = modifiedId;
+    }
+
+    public Date getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(Date modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+}
\ No newline at end of file

server/src/main/java/com/pica/cloud/account/account/server/job/AccountRepeatDataJob.java

@@ -23,8 +23,10 @@ public class AccountRepeatDataJob extends IJobHandler {
     @Override
     public ReturnT<String> execute(String s) throws Exception {
         accountInfoDetailMapper.processAccountRepeatData();
-        XxlJobLogger.log("AccountRepeatDataJob");
+        XxlJobLogger.log("repeat date-----");
         return SUCCESS;
 
+
+
     }
 }

server/src/main/java/com/pica/cloud/account/account/server/job/DoctorLogHandler.java

+package com.pica.cloud.account.account.server.job;
+
+import com.pica.cloud.account.account.server.mapper.DoctorMapper;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.IJobHandler;
+import com.xxl.job.core.handler.annotation.JobHandler;
+import com.xxl.job.core.log.XxlJobLogger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created on 2019/12/16 17:53
+ * author:crs
+ * Description:记录doctor修改记录日志
+ */
+@JobHandler(value = "DoctorLogHandler")
+@Component
+public class DoctorLogHandler extends IJobHandler {
+
+    @Autowired
+    private DoctorMapper doctorMapper;
+
+    @Override
+    public ReturnT<String> execute(String s) throws Exception {
+        XxlJobLogger.log("doctorLogRecord start-----");
+        Integer rows = doctorMapper.updateDoctorModifyRecord();
+        XxlJobLogger.log("doctorLogRecord end-----"+rows);
+        return SUCCESS;
+    }
+}

server/src/main/java/com/pica/cloud/account/account/server/job/HospitalLogHandler.java

+package com.pica.cloud.account.account.server.job;
+
+import com.pica.cloud.account.account.server.mapper.HospitalMapper;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.IJobHandler;
+import com.xxl.job.core.handler.annotation.JobHandler;
+import com.xxl.job.core.log.XxlJobLogger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created on 2019/12/16 17:53
+ * author:crs
+ * Description:记录doctor修改记录日志
+ */
+@JobHandler(value = "HospitalLogHandler")
+@Component
+public class HospitalLogHandler extends IJobHandler {
+
+    @Autowired
+    private HospitalMapper hospitalMapper;
+
+    @Override
+    public ReturnT<String> execute(String s) throws Exception {
+        XxlJobLogger.log("hospitalLogRecord start-----");
+        Integer rows = hospitalMapper.updateDoctorModifyRecord();
+        XxlJobLogger.log("hospitalLogRecord end-----"+rows);
+        return SUCCESS;
+    }
+}

server/src/main/java/com/pica/cloud/account/account/server/job/PermissionRoleLogHandler.java

+package com.pica.cloud.account.account.server.job;
+
+import com.pica.cloud.account.account.server.mapper.PermissionDoctorRoleMapper;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.IJobHandler;
+import com.xxl.job.core.handler.annotation.JobHandler;
+import com.xxl.job.core.log.XxlJobLogger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created on 2019/12/16 17:53
+ * author:crs
+ * Description:记录doctor修改记录日志
+ */
+@JobHandler(value = "PermissionRoleLogHandler")
+@Component
+public class PermissionRoleLogHandler extends IJobHandler {
+
+    @Autowired
+    private PermissionDoctorRoleMapper permissionDoctorRoleMapper;
+
+    @Override
+    public ReturnT<String> execute(String s) throws Exception {
+        XxlJobLogger.log("permissionRoleLogRecord start-----");
+        Integer rows = permissionDoctorRoleMapper.updatePermissionModifyRecord();
+        XxlJobLogger.log("permissionLogRecord end-----"+rows);
+        return SUCCESS;
+    }
+}

server/src/main/java/com/pica/cloud/account/account/server/mapper/AccountInfoDetailMapper.java

@@ -2,6 +2,9 @@ package com.pica.cloud.account.account.server.mapper;
 
 
 import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
 
 public interface AccountInfoDetailMapper {
     /**
@@ -58,7 +61,7 @@ public interface AccountInfoDetailMapper {
 
     int insertSelective(AccountInfoEntity record);
 
-    void updateDeleteByPrimaryKey(Integer acctId);
+    void updateDeleteByPrimaryKey(@Param("map") HashMap<String, Long> map);
 
     void processAccountRepeatData();
 

server/src/main/java/com/pica/cloud/account/account/server/mapper/DoctorMapper.java

@@ -6,6 +6,8 @@ import com.pica.cloud.account.account.server.entity.DoctorEntity;
 import com.pica.cloud.account.account.server.entity.PICAPDoctor;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
+
 public interface DoctorMapper {
     /**
      * 获取医生信息
@@ -83,15 +85,26 @@ public interface DoctorMapper {
 
     PICAPDoctor queryDoctor(long doctorId);
 
-    void updateDeleteByPrimaryKey(Integer id);
+    void updateDeleteByPrimaryKey(@Param("map") HashMap<String, Long> map);
 
 
     /**
      * 通过手机号获取用户id
+     *
      * @param mobile
      * @return
      */
     //Long selectDoctorIdByMobile(String mobile);
 
     Integer getAcctIdByDoctorId(long id);
+
+
+    /**
+     * 更新p_doctor表的修改记录
+     *
+     * @return
+     */
+    Integer updateDoctorModifyRecord();
+
+
 }
\ No newline at end of file

server/src/main/java/com/pica/cloud/account/account/server/mapper/HospitalMapper.java

+package com.pica.cloud.account.account.server.mapper;
+
+
+import com.pica.cloud.account.account.server.entity.Hospital;
+
+public interface HospitalMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(Hospital record);
+
+    int insertSelective(Hospital record);
+
+    Hospital selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(Hospital record);
+
+    int updateByPrimaryKey(Hospital record);
+
+    Integer updateDoctorModifyRecord();
+}
\ No newline at end of file

server/src/main/java/com/pica/cloud/account/account/server/mapper/PermissionDoctorRoleMapper.java

+package com.pica.cloud.account.account.server.mapper;
+
+
+import com.pica.cloud.account.account.server.entity.PermissionDoctorRole;
+
+public interface PermissionDoctorRoleMapper {
+    int deleteByPrimaryKey(Long id);
+
+    int insert(PermissionDoctorRole record);
+
+    int insertSelective(PermissionDoctorRole record);
+
+    PermissionDoctorRole selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(PermissionDoctorRole record);
+
+    int updateByPrimaryKey(PermissionDoctorRole record);
+
+    /**
+     * 记录用户权限修改记录
+     *
+     * @return
+     */
+    Integer updatePermissionModifyRecord();
+}
\ No newline at end of file

server/src/main/java/com/pica/cloud/account/account/server/service/DoctorService.java

@@ -22,21 +22,21 @@ public interface DoctorService {
      *
      * @param doctor 待修改数据
      */
-    void modifyDoctorInfo(Doctor doctor);
+    void modifyDoctorInfo(Doctor doctor,Long doctorId);
 
     /**
      * 修改医生信息
      *
      * @param id 待修改数据
      */
-    void deleteDoctorInfo(Integer id);
+    void deleteDoctorInfo(Integer id,Long modifyId);
 
     /**
      * 客服系统新增医生用户
      *
      * @param doctor 新的医生数据
      */
-    Integer addDoctorInfo(Doctor doctor);
+    Integer addDoctorInfo(Doctor doctor,Long doctorId);
 
     /**
      * doctor绑定微信

server/src/main/java/com/pica/cloud/account/account/server/service/impl/AccountServiceImpl.java

@@ -2,6 +2,7 @@ package com.pica.cloud.account.account.server.service.impl;
 
 import com.pica.cloud.account.account.server.entity.Account;
 import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
+import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.mapper.AccountInfoDetailMapper;
 import com.pica.cloud.account.account.server.mapper.AccountMapper;
 import com.pica.cloud.account.account.server.service.AccountService;
@@ -89,8 +90,8 @@ public class AccountServiceImpl implements AccountService {
         accountInfo.setRegTime(currentTime);
         accountInfo.setDeleteFlag(1);
         accountInfo.setSex(0);
-        accountInfo.setRegisterProduct(1);
-        accountInfo.setRegisterSource(5);
+        accountInfo.setRegisterProduct(AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode());
+        accountInfo.setRegisterSource(AccountTypeEnum.DEVICE_TYPE_H5.getCode());
         accountInfoDetailMapper.insertSelective(accountInfo);
         Integer acctId = accountInfo.getId();
         //doctor表,存入用户id
@@ -123,7 +124,6 @@ public class AccountServiceImpl implements AccountService {
         map.put("hospital_id", cacheClient.hget(key, "hospital_id"));
         map.put("hospital", cacheClient.hget(key, "hospital"));
         map.put("name", cacheClient.hget(key, "name"));
-
 //        Map<String, String> result = cacheClient.hgetall(key);
 //        Iterator<Map.Entry<String, String>> iterator = result.entrySet().iterator();
 //        while(iterator.hasNext()){
@@ -132,7 +132,6 @@ public class AccountServiceImpl implements AccountService {
 //            String value = next.getValue();
 //            logger.info("更新用户缓存信息已完成数量：{}", key1 + "------>"+value);
 //        }
-
 //        PicaUser picaUser = cacheClient.getToken("F64279B337EA4AE3965853A7CCFDF5A3", PicaUser.class);
 //        logger.info("更新用户缓存信息已完成数量：", picaUser.toString());
         return map;

server/src/main/java/com/pica/cloud/account/account/server/service/impl/DoctorServiceImpl.java

@@ -3,6 +3,7 @@ package com.pica.cloud.account.account.server.service.impl;
 import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
 import com.pica.cloud.account.account.server.entity.Doctor;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
+import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
 import com.pica.cloud.account.account.server.mapper.AccountInfoDetailMapper;
 import com.pica.cloud.account.account.server.mapper.DoctorMapper;
@@ -18,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.Date;
+import java.util.HashMap;
 
 /**
  * Created on 2019/9/11 11:02
@@ -40,7 +42,7 @@ public class DoctorServiceImpl implements DoctorService {
 
     @Transactional
     @Override
-    public void modifyDoctorInfo(Doctor doctor) {
+    public void modifyDoctorInfo(Doctor doctor,Long doctorId) {
         Integer id = doctor.getId();
         if (id == null) {
             throw new AccountException(AccountExceptionEnum.PICA_PARAMS_ERROR);
@@ -60,20 +62,26 @@ public class DoctorServiceImpl implements DoctorService {
         AccountInfoEntity accountInfoEntity = new AccountInfoEntity();
         accountInfoEntity.setMobilePhone(AESUtil.encryptV0(mobilePhone));
         accountInfoEntity.setId(acctId);
-        accountInfoEntity.setModifiedId(1580052);
+        accountInfoEntity.setModifiedId(doctorId.intValue());
         accountInfoEntity.setModifiedTime(new Date());
         accountInfoDetailMapper.updateByPrimaryKeySelective(accountInfoEntity);
     }
 
     @Transactional
     @Override
-    public void deleteDoctorInfo(Integer id) {
+    public void deleteDoctorInfo(Integer id,Long modifyId) {
         //p_doctor表修改记录状态
         Doctor doctor = doctorMapper.selectByPrimaryKey(id);
         if (doctor != null) {
             Integer acctId = doctor.getAcctId();
-            doctorMapper.updateDeleteByPrimaryKey(id);
-            accountInfoDetailMapper.updateDeleteByPrimaryKey(acctId);
+            HashMap<String, Long> map = new HashMap<>();
+            map.put("id",id.longValue());
+            map.put("modifyId",modifyId);
+            doctorMapper.updateDeleteByPrimaryKey(map);
+            HashMap<String, Long> acctMap = new HashMap<>();
+            acctMap.put("modifyId",modifyId);
+            acctMap.put("acctId",acctId.longValue());
+            accountInfoDetailMapper.updateDeleteByPrimaryKey(acctMap);
         } else {
             throw new AccountException(AccountExceptionEnum.PICA_NOT_REGISTER);
         }
@@ -90,7 +98,7 @@ public class DoctorServiceImpl implements DoctorService {
      */
     @Override
     @Transactional
-    public Integer addDoctorInfo(Doctor doctor) {
+    public Integer addDoctorInfo(Doctor doctor,Long doctorId) {
         String mobilePhone = doctor.getMobilePhone();
         String mobileEncrypt = AESUtil.encryptV0(mobilePhone);
         AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(mobileEncrypt);
@@ -104,11 +112,12 @@ public class DoctorServiceImpl implements DoctorService {
         entity.setPassword(password);
         entity.setCreatedTime(currentTime);
         entity.setModifiedTime(currentTime);
-        entity.setModifiedId(1580052);
-        entity.setRegisterProduct(1);
+        entity.setModifiedId(doctorId.intValue());
+        entity.setRegisterProduct(AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode());
         entity.setRegTime(currentTime);
-        entity.setRegisterSource(3);
-        entity.setCreatedId(0);
+        //客服系统新增医生
+        entity.setRegisterSource(AccountTypeEnum.DEVICE_TYPE_ADMIN.getCode());
+        entity.setCreatedId(doctorId.intValue());
         entity.setDeleteFlag(1);
         entity.setSex(doctor.getSex());
         entity.setName(doctor.getName());
@@ -118,8 +127,8 @@ public class DoctorServiceImpl implements DoctorService {
         accountInfoDetailMapper.insertSelective(entity);
         doctor.setAcctId(entity.getId());
         doctor.setMobilePhone(mobileEncrypt);
-        doctor.setModifyId(1580052);
-        doctor.setCreatId(0);
+        doctor.setModifyId(doctorId.intValue());
+        doctor.setCreatId(doctorId.intValue());
         doctor.setCreatTime(currentTime);
         doctor.setModifyTime(new Date());
         doctor.setDeleteFlag(1);

server/src/main/java/com/pica/cloud/account/account/server/util/AESUtil.java

 package com.pica.cloud.account.account.server.util;
 
+import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
+import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.utils.utils.EncryptCreateUtil;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
@@ -9,6 +11,7 @@ import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
 import javax.crypto.spec.SecretKeySpec;
 import java.math.BigInteger;
+import java.util.ArrayList;
 
 /**
  * Created on 2019/10/21 13:20
@@ -176,26 +179,36 @@ public class AESUtil {
      * 测试
      */
     public static void main(String[] args) throws Exception {
-        String KEY="zJJ$c5md3$yuuhWW";
-        System.out.println("-------------加密---------");
-        String content = "18621903846";
-
-
-        System.out.println("加密前：" + content);
-        System.out.println("加密密钥和解密密钥：" + KEY);
-
-        System.out.println("-------------解密---------");
-        String encrypt = aesEncrypt(content, KEY);
-        System.out.println("加密后：" + encrypt);
-        String decrypt = aesDecrypt("ieE4wN+GkIxm8S8tSVqTow==", KEY);
-        System.out.println("解密后：" + decrypt);
+//        String KEY="zJJ$c5md3$yuuhWW";
+//        System.out.println("-------------加密---------");
+//        String content = "18621903846";
+//
+//
+//        System.out.println("加密前：" + content);
+//        System.out.println("加密密钥和解密密钥：" + KEY);
+//
+//        System.out.println("-------------解密---------");
+//        String encrypt = aesEncrypt(content, KEY);
+//        System.out.println("加密后：" + encrypt);
+//        String decrypt = aesDecrypt("ieE4wN+GkIxm8S8tSVqTow==", KEY);
+//        System.out.println("解密后：" + decrypt);
 
           //请求参数解密处理
-//        String key="l5RTSTcegLhwnRiSLTH80A0rPg1TjikcLKOoa4c5+cShLS0hPAV6W63Ef4L3Q2OmHZFLnzewwKkxSPfjdi8LqsHQfAZfyVBRtr2t2bteaj6mHV6HwE/OYkXJI6tZ9mQOAgcItABqsZ87tmyXFJ2I2SNYhqNt4LK5dhbZKc7j3ps=";
-//        String decrypt = RSAUtil.decrypt(key,privateKey);
-//        System.out.println(decrypt);
-//        String content="9YCzImpeP3vISHDjNXkvNCNxKkr4k808Hi3WLdwy+io7YGU+gWcmJMIeaqCosbjD";
-//        String result = AESUtil.aesDecrypt(content, decrypt);
-//        System.out.println(result);
+        String key="aPzpkXKhX0xsgwG0L7uOiz47fKQKKW1pzzIyx9wRSoCtm4vux1+ctjKzQ77jb+Vvt4zB/z0wr7U5nszk7kXLKQR4A6nU5nt8O44CHjCHUU0dWbpPyd2TKFdZ58ZyKLsk1+Xc4wJ1HB0FQjxJefWvo5ioFYLasOpxSbKU7oHqXq4=";
+        String decrypt = RSAUtil.decrypt(key,procPrivateKey);
+        System.out.println(decrypt);
+        String content="x/119w4nmos1xMG1DFNzBDeUP7BmyGViwXB66UCCk2HaCoJWhNg6qL1WoDMLGkiMJni8GV8fzEpd+1h9z4LA99wEkn47rbK6+MLaGkMIv+QmXzMLxThpLJNxadb2ltRyKgz5wERoFB/AH/xxgRn8kw==";
+        String result = AESUtil.aesDecrypt(content, decrypt);
+        System.out.println(result);
+
+
+//        ArrayList<String> list = new ArrayList<>();
+//        int[] a = {99857217,99857231,99884890,99885124,99887349,99888816,99888820,99888821,99888822,99888830,99888831,99888837,99888842,99888847,99888851,99888855,99888860,99888867,99888876,99888879,99888884,99888896,99888897,99888900,99888901,99888923,99888930,99888943,99888983,99889000,99889032,99889043,99889046,99889104,99889142,99889158,99889165,99889177,99889184,99889218,99889230,99889236,99889250,99889304,99889380,99889401,99889426,99889435,99889508,99889510,99889538,99889719,99889723,99889731,99889922,99889931,99890029,99890043,99890137,99890152,99890157,99890163,99890237,99890461,99890473,99890485,99890495,99890656,99890658,99890662,99890663,99890670,99890774,99891395,99891410,99891424,99891432,99891439,99891480,99891517};
+//        for (int i = 0; i <a .length ; i++) {
+//            Integer id = a[i];
+//            list.add(EncryptUtils.encryptContent(id.toString(), EncryptConstants.ENCRYPT_TYPE_ID));
+//        }
+//        System.out.println(list.toArray());
+
     }
 }

server/src/main/resources/bootstrap.properties

-spring.profiles.active=uat
\ No newline at end of file
+spring.profiles.active=dev
\ No newline at end of file

server/src/main/resources/mybatis/AccountInfoEntityMapper.xml

@@ -57,8 +57,8 @@
     </update>
 
     <!--逻辑删除用户-->
-    <update id="updateDeleteByPrimaryKey" parameterType="java.lang.Integer">
-      update account_info set delete_flag=2,modified_time=now(), modified_id=#{acctId} where id=#{acctId}
+    <update id="updateDeleteByPrimaryKey" >
+      update account_info set delete_flag=2,modified_time=now(), modified_id=#{map.modifyId} where id=#{map.acctId}
   </update>
 
     <!--更新用户的手机号-->

server/src/main/resources/mybatis/DoctorMapper.xml

@@ -88,9 +88,22 @@
     inner JOIN (SELECT mobile_phone,MIN(id) as id FROM p_doctor WHERE delete_flag=1 and mobile_phone is not null GROUP BY mobile_phone having count(*)>1) inn
     on pd.id != inn.id and pd.mobile_phone = inn.mobile_phone) ttt);
 
-
     </update>
 
+    <insert id="updateDoctorModifyRecord">
+        insert into log_p_doctor(`doctor_id`, `sex`, `name`, `mobile_phone`, `tel`, `status`, `type`, `hospital_id`,
+        `department_id`, `title_id`, `hospital`, `department`, `title`, `cert_image_url`, `avatar_image_url`,
+        `auth_time`,
+        `honor`, `skills`, `thumb_up_num`, `email`, `qrcode`, `nickname`, `personal_sign`, `delete_flag`, `creat_id`,
+        `creat_time`, `modify_id`, `modify_time`, `praise_num`, `password`, `info`, `rank`, `province`, `province_name`,
+        `city`, `city_name`, `county`, `county_name`, `town`, `town_name`, `invite_code`, `invite_start_time`,
+        `gaoxueya_password`, `sms_send_num`, `total_sms_send_num`, `entire_flag`, `doctor_project_type`, `reg_time`,
+        `last_login_time`, `unionid`, `register_source`, `comment`, `administer_title_id`, `administer_title`,
+        `register_type`,
+        `first_login_time`, `card`, `birthday`, `show_flag`, `acct_id`)
+        SELECT * FROM p_doctor where modify_time &gt;  DATE_SUB(DATE_FORMAT(NOW(),'%Y-%m-%d %H:00:00'),INTERVAL 1 hour)
+        and modify_time  &lt;  DATE_FORMAT(NOW(), '%Y-%m-%d %H:00:00')
+    </insert>
 
     <!--通过手机号查询用户id-->
     <select id="selectDoctorIdByMobile" parameterType="java.lang.String" resultType="java.lang.Long">
@@ -113,12 +126,12 @@
         select
         <include refid="Base_Column_List"/>
         from p_doctor
-        where id = #{id,jdbcType=INTEGER} and delete_flag=1
+        where id = #{id} and delete_flag=1
     </select>
 
     <!--删除用户-->
-    <update id="updateDeleteByPrimaryKey" parameterType="java.lang.Integer">
-        update p_doctor set delete_flag=2,modify_time=now(), modify_id=#{id} where id=#{id} limit 1
+    <update id="updateDeleteByPrimaryKey"  parameterType="map">
+        update p_doctor set delete_flag=2,modify_time=now(), modify_id=#{map.modifyId} where id=#{map.id} limit 1
     </update>
 
     <!--根据手机号获取数据-->

server/src/main/resources/mybatis/PermissionDoctorRoleMapper.xml

+<?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.pica.cloud.account.account.server.mapper.PermissionDoctorRoleMapper">
+    <resultMap id="BaseResultMap" type="com.pica.cloud.account.account.server.entity.PermissionDoctorRole">
+        <id column="id" property="id" jdbcType="BIGINT"/>
+        <result column="doctor_id" property="doctorId" jdbcType="BIGINT"/>
+        <result column="hospital_id" property="hospitalId" jdbcType="BIGINT"/>
+        <result column="role_id" property="roleId" jdbcType="BIGINT"/>
+        <result column="delete_flag" property="deleteFlag" jdbcType="INTEGER"/>
+        <result column="created_id" property="createdId" jdbcType="BIGINT"/>
+        <result column="created_time" property="createdTime" jdbcType="TIMESTAMP"/>
+        <result column="modified_id" property="modifiedId" jdbcType="BIGINT"/>
+        <result column="modified_time" property="modifiedTime" jdbcType="TIMESTAMP"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+    id, doctor_id, hospital_id, role_id, delete_flag, created_id, created_time, modified_id, 
+    modified_time
+  </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">
+        select
+        <include refid="Base_Column_List"/>
+        from permission_doctor_role
+        where id = #{id,jdbcType=BIGINT}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from permission_doctor_role
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+
+    <!--用户权限记录表的变更-->
+    <insert id="updatePermissionModifyRecord">
+        insert into log_permission_doctor_role(`id`, `doctor_id`, `hospital_id`, `role_id`, `delete_flag`, `created_id`,
+        `created_time`, `modified_id`, `modified_time`)
+        SELECT * FROM permission_doctor_role where modified_time &gt; DATE_SUB(DATE_FORMAT(NOW(),'%Y-%m-%d
+        %H:00:00'),INTERVAL 1 hour) and modified_time &lt; DATE_FORMAT(NOW(), '%Y-%m-%d %H:00:00')
+    </insert>
+
+    <insert id="insert" parameterType="com.pica.cloud.account.account.server.entity.PermissionDoctorRole">
+    insert into permission_doctor_role (id, doctor_id, hospital_id, 
+      role_id, delete_flag, created_id, 
+      created_time, modified_id, modified_time
+      )
+    values (#{id,jdbcType=BIGINT}, #{doctorId,jdbcType=BIGINT}, #{hospitalId,jdbcType=BIGINT}, 
+      #{roleId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=INTEGER}, #{createdId,jdbcType=BIGINT}, 
+      #{createdTime,jdbcType=TIMESTAMP}, #{modifiedId,jdbcType=BIGINT}, #{modifiedTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+    <insert id="insertSelective" parameterType="com.pica.cloud.account.account.server.entity.PermissionDoctorRole">
+        insert into permission_doctor_role
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="doctorId != null">
+                doctor_id,
+            </if>
+            <if test="hospitalId != null">
+                hospital_id,
+            </if>
+            <if test="roleId != null">
+                role_id,
+            </if>
+            <if test="deleteFlag != null">
+                delete_flag,
+            </if>
+            <if test="createdId != null">
+                created_id,
+            </if>
+            <if test="createdTime != null">
+                created_time,
+            </if>
+            <if test="modifiedId != null">
+                modified_id,
+            </if>
+            <if test="modifiedTime != null">
+                modified_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=BIGINT},
+            </if>
+            <if test="doctorId != null">
+                #{doctorId,jdbcType=BIGINT},
+            </if>
+            <if test="hospitalId != null">
+                #{hospitalId,jdbcType=BIGINT},
+            </if>
+            <if test="roleId != null">
+                #{roleId,jdbcType=BIGINT},
+            </if>
+            <if test="deleteFlag != null">
+                #{deleteFlag,jdbcType=INTEGER},
+            </if>
+            <if test="createdId != null">
+                #{createdId,jdbcType=BIGINT},
+            </if>
+            <if test="createdTime != null">
+                #{createdTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="modifiedId != null">
+                #{modifiedId,jdbcType=BIGINT},
+            </if>
+            <if test="modifiedTime != null">
+                #{modifiedTime,jdbcType=TIMESTAMP},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective"
+            parameterType="com.pica.cloud.account.account.server.entity.PermissionDoctorRole">
+        update permission_doctor_role
+        <set>
+            <if test="doctorId != null">
+                doctor_id = #{doctorId,jdbcType=BIGINT},
+            </if>
+            <if test="hospitalId != null">
+                hospital_id = #{hospitalId,jdbcType=BIGINT},
+            </if>
+            <if test="roleId != null">
+                role_id = #{roleId,jdbcType=BIGINT},
+            </if>
+            <if test="deleteFlag != null">
+                delete_flag = #{deleteFlag,jdbcType=INTEGER},
+            </if>
+            <if test="createdId != null">
+                created_id = #{createdId,jdbcType=BIGINT},
+            </if>
+            <if test="createdTime != null">
+                created_time = #{createdTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="modifiedId != null">
+                modified_id = #{modifiedId,jdbcType=BIGINT},
+            </if>
+            <if test="modifiedTime != null">
+                modified_time = #{modifiedTime,jdbcType=TIMESTAMP},
+            </if>
+        </set>
+        where id = #{id,jdbcType=BIGINT}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.pica.cloud.account.account.server.entity.PermissionDoctorRole">
+    update permission_doctor_role
+    set doctor_id = #{doctorId,jdbcType=BIGINT},
+      hospital_id = #{hospitalId,jdbcType=BIGINT},
+      role_id = #{roleId,jdbcType=BIGINT},
+      delete_flag = #{deleteFlag,jdbcType=INTEGER},
+      created_id = #{createdId,jdbcType=BIGINT},
+      created_time = #{createdTime,jdbcType=TIMESTAMP},
+      modified_id = #{modifiedId,jdbcType=BIGINT},
+      modified_time = #{modifiedTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>
\ No newline at end of file