linxk 1 月之前
父節點
當前提交
ea84b889c2
共有 100 個文件被更改,包括 98 次插入1742 次删除
  1. 1 18
      cif-api/pom.xml
  2. 0 11
      cif-api/src/main/java/com/medipath/cif/service/OrgDubboService.java
  3. 0 30
      cif-api/src/main/java/com/medipath/cif/service/UserDubboService.java
  4. 1 1
      cif-api/src/main/java/com/txz/cif/dto/AccountDTO.java
  5. 1 1
      cif-api/src/main/java/com/txz/cif/dto/AccountFlowDTO.java
  6. 1 1
      cif-api/src/main/java/com/txz/cif/dto/AccountFreezdDTO.java
  7. 1 1
      cif-api/src/main/java/com/txz/cif/dto/BannerDTO.java
  8. 1 1
      cif-api/src/main/java/com/txz/cif/dto/DayCutDTO.java
  9. 1 1
      cif-api/src/main/java/com/txz/cif/dto/FlowDTO.java
  10. 1 1
      cif-api/src/main/java/com/txz/cif/dto/GoodsDTO.java
  11. 1 1
      cif-api/src/main/java/com/txz/cif/dto/HospitalDTO.java
  12. 1 1
      cif-api/src/main/java/com/txz/cif/dto/MenuDTO.java
  13. 1 1
      cif-api/src/main/java/com/txz/cif/dto/OperatorDTO.java
  14. 1 1
      cif-api/src/main/java/com/txz/cif/dto/OrderDTO.java
  15. 1 1
      cif-api/src/main/java/com/txz/cif/dto/OrgContractDTO.java
  16. 1 1
      cif-api/src/main/java/com/txz/cif/dto/OrgDTO.java
  17. 1 1
      cif-api/src/main/java/com/txz/cif/dto/OrgHospitalDTO.java
  18. 1 1
      cif-api/src/main/java/com/txz/cif/dto/OrgUserDTO.java
  19. 1 1
      cif-api/src/main/java/com/txz/cif/dto/Result.java
  20. 1 1
      cif-api/src/main/java/com/txz/cif/dto/SalesmanDTO.java
  21. 1 1
      cif-api/src/main/java/com/txz/cif/dto/SettleDTO.java
  22. 1 1
      cif-api/src/main/java/com/txz/cif/dto/SettleInventoryDTO.java
  23. 1 1
      cif-api/src/main/java/com/txz/cif/dto/SettlePlanDTO.java
  24. 1 1
      cif-api/src/main/java/com/txz/cif/dto/SubjectDTO.java
  25. 1 1
      cif-api/src/main/java/com/txz/cif/dto/SysMessageDTO.java
  26. 1 1
      cif-api/src/main/java/com/txz/cif/dto/SysMessageTemplateDTO.java
  27. 1 1
      cif-api/src/main/java/com/txz/cif/dto/UserDTO.java
  28. 1 1
      cif-api/src/main/java/com/txz/cif/dto/UserFriendDTO.java
  29. 1 1
      cif-api/src/main/java/com/txz/cif/dto/UserFriendDeleteRecordDTO.java
  30. 1 1
      cif-api/src/main/java/com/txz/cif/dto/UserFriendRequestDTO.java
  31. 1 1
      cif-api/src/main/java/com/txz/cif/dto/UserGroupDTO.java
  32. 1 1
      cif-api/src/main/java/com/txz/cif/dto/UserGroupMemberDTO.java
  33. 1 1
      cif-api/src/main/java/com/txz/cif/dto/UserIntroductoryDTO.java
  34. 1 1
      cif-api/src/main/java/com/txz/cif/dto/UserLogDTO.java
  35. 1 1
      cif-api/src/main/java/com/txz/cif/dto/UserOperatorDTO.java
  36. 1 1
      cif-api/src/main/java/com/txz/cif/dto/UserSignatureDTO.java
  37. 1 1
      cif-api/src/main/java/com/txz/cif/dto/WxMchDTO.java
  38. 1 3
      cif-api/src/main/java/com/txz/cif/enums/BizTypeEnum.java
  39. 1 1
      cif-api/src/main/java/com/txz/cif/param/CommissionParam.java
  40. 1 1
      cif-api/src/main/java/com/txz/cif/param/FeeParam.java
  41. 1 1
      cif-api/src/main/java/com/txz/cif/param/FreezdParam.java
  42. 1 1
      cif-api/src/main/java/com/txz/cif/param/MessageParam.java
  43. 1 1
      cif-api/src/main/java/com/txz/cif/param/RechargeParam.java
  44. 1 1
      cif-api/src/main/java/com/txz/cif/param/TransParam.java
  45. 1 3
      cif-api/src/main/java/com/txz/cif/param/UnFreezdAndTransParam.java
  46. 1 1
      cif-api/src/main/java/com/txz/cif/param/WithdrawParam.java
  47. 4 4
      cif-api/src/main/java/com/txz/cif/service/AccountDubboService.java
  48. 11 0
      cif-api/src/main/java/com/txz/cif/service/OrgDubboService.java
  49. 2 8
      cif-api/src/main/java/com/txz/cif/service/SettleDubboService.java
  50. 27 0
      cif-api/src/main/java/com/txz/cif/service/UserDubboService.java
  51. 10 31
      cif-service/pom.xml
  52. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/AccountFreezdMapper.java
  53. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/ApplicationMapper.java
  54. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/BannerMapper.java
  55. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/FlowMapper.java
  56. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/GoodsMapper.java
  57. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/HospitalMapper.java
  58. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/MenuMapper.java
  59. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/NumberRuleMapper.java
  60. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/OperatorMapper.java
  61. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/OrderMapper.java
  62. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/OrgHospitalMapper.java
  63. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/OrgMapper.java
  64. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/OrgUserMapper.java
  65. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/SalesmanMapper.java
  66. 0 8
      cif-service/src/main/java/com/medipath/cif/dao/SequenceMapper.java
  67. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/SettleInventoryMapper.java
  68. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/SettleMapper.java
  69. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/SettlePlanMapper.java
  70. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/SubjectMapper.java
  71. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/SysMessageMapper.java
  72. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/SysMessageTemplateMapper.java
  73. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/UserLogMapper.java
  74. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/UserMapper.java
  75. 0 7
      cif-service/src/main/java/com/medipath/cif/dao/WxMchMapper.java
  76. 0 19
      cif-service/src/main/java/com/medipath/cif/dubbo/client/AreaDubboServiceClient.java
  77. 0 25
      cif-service/src/main/java/com/medipath/cif/dubbo/client/CaseDubboServiceClient.java
  78. 0 33
      cif-service/src/main/java/com/medipath/cif/dubbo/client/DeviceDubboServiceClient.java
  79. 0 21
      cif-service/src/main/java/com/medipath/cif/dubbo/client/MessageDubboServiceClient.java
  80. 0 51
      cif-service/src/main/java/com/medipath/cif/dubbo/impl/OrgDubboServiceImpl.java
  81. 0 174
      cif-service/src/main/java/com/medipath/cif/dubbo/impl/SettleDubboServiceImpl.java
  82. 0 112
      cif-service/src/main/java/com/medipath/cif/dubbo/impl/UserDubboServiceImpl.java
  83. 0 148
      cif-service/src/main/java/com/medipath/cif/model/Hospital.java
  84. 0 141
      cif-service/src/main/java/com/medipath/cif/model/Org.java
  85. 0 75
      cif-service/src/main/java/com/medipath/cif/model/OrgHospital.java
  86. 0 40
      cif-service/src/main/java/com/medipath/cif/model/OrgUser.java
  87. 0 155
      cif-service/src/main/java/com/medipath/cif/model/Salesman.java
  88. 0 212
      cif-service/src/main/java/com/medipath/cif/model/WxMch.java
  89. 0 11
      cif-service/src/main/java/com/medipath/cif/service/HospitalService.java
  90. 0 11
      cif-service/src/main/java/com/medipath/cif/service/OrgHospitalService.java
  91. 0 11
      cif-service/src/main/java/com/medipath/cif/service/OrgService.java
  92. 0 11
      cif-service/src/main/java/com/medipath/cif/service/OrgUserService.java
  93. 0 11
      cif-service/src/main/java/com/medipath/cif/service/SalesmanService.java
  94. 0 22
      cif-service/src/main/java/com/medipath/cif/service/WxMchService.java
  95. 0 22
      cif-service/src/main/java/com/medipath/cif/service/impl/HospitalServiceImpl.java
  96. 0 22
      cif-service/src/main/java/com/medipath/cif/service/impl/OrgHospitalServiceImpl.java
  97. 0 22
      cif-service/src/main/java/com/medipath/cif/service/impl/OrgServiceImpl.java
  98. 0 22
      cif-service/src/main/java/com/medipath/cif/service/impl/OrgUserServiceImpl.java
  99. 0 22
      cif-service/src/main/java/com/medipath/cif/service/impl/SalesmanServiceImpl.java
  100. 0 31
      cif-service/src/main/java/com/medipath/cif/service/impl/SettleServiceImpl.java

+ 1 - 18
cif-api/pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>cif</artifactId>
-        <groupId>com.medipath</groupId>
+        <groupId>com.txz</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -24,23 +24,6 @@
             <scope>provided</scope>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba</groupId>-->
-<!--            <artifactId>fastjson</artifactId>-->
-<!--            <version>1.2.69</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>cn.hutool</groupId>-->
-<!--            <artifactId>hutool-all</artifactId>-->
-<!--            <version>RELEASE</version>-->
-<!--            <scope>compile</scope>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.github.pagehelper</groupId>-->
-<!--            <artifactId>pagehelper</artifactId>-->
-<!--            <version>5.1.2</version>-->
-<!--            <scope>compile</scope>-->
-<!--        </dependency>-->
 
     </dependencies>
 

+ 0 - 11
cif-api/src/main/java/com/medipath/cif/service/OrgDubboService.java

@@ -1,11 +0,0 @@
-package com.medipath.cif.service;
-
-import com.medipath.cif.dto.OrgDTO;
-
-public interface OrgDubboService {
-
-    void saveOrgHospital(Long orgId,Long hospitalId, Integer type);
-
-    OrgDTO getOrgById(Long orgId);
-
-}

+ 0 - 30
cif-api/src/main/java/com/medipath/cif/service/UserDubboService.java

@@ -1,30 +0,0 @@
-package com.medipath.cif.service;
-
-
-import com.medipath.cif.dto.HospitalDTO;
-import com.medipath.cif.dto.OrgDTO;
-import com.medipath.cif.dto.Result;
-import com.medipath.cif.dto.UserDTO;
-import com.medipath.cif.param.MessageParam;
-
-public interface UserDubboService {
-
-    /**
-     * 验证登录
-     * @param token
-     * @return
-     */
-    Result<UserDTO> validateLogin(String token);
-
-    UserDTO getUser(Long userId);
-
-    OrgDTO getOrgByUserId(Long userId);
-
-    HospitalDTO getHospitalByUserId(Long userId);
-
-    HospitalDTO getHospitalById(Long hospitalId);
-
-    void updateLastTime(Long userId);
-
-    boolean sendMsg(MessageParam param);
-}

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/AccountDTO.java → cif-api/src/main/java/com/txz/cif/dto/AccountDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-04
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/AccountFlowDTO.java → cif-api/src/main/java/com/txz/cif/dto/AccountFlowDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-04
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/AccountFreezdDTO.java → cif-api/src/main/java/com/txz/cif/dto/AccountFreezdDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-19
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/BannerDTO.java → cif-api/src/main/java/com/txz/cif/dto/BannerDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/DayCutDTO.java → cif-api/src/main/java/com/txz/cif/dto/DayCutDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-12-13
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/FlowDTO.java → cif-api/src/main/java/com/txz/cif/dto/FlowDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/GoodsDTO.java → cif-api/src/main/java/com/txz/cif/dto/GoodsDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2023-03-18
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/HospitalDTO.java → cif-api/src/main/java/com/txz/cif/dto/HospitalDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-11
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/MenuDTO.java → cif-api/src/main/java/com/txz/cif/dto/MenuDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2023-01-05
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/OperatorDTO.java → cif-api/src/main/java/com/txz/cif/dto/OperatorDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/OrderDTO.java → cif-api/src/main/java/com/txz/cif/dto/OrderDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2023-03-18
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/OrgContractDTO.java → cif-api/src/main/java/com/txz/cif/dto/OrgContractDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-04
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/OrgDTO.java → cif-api/src/main/java/com/txz/cif/dto/OrgDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import lombok.Data;
 

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/OrgHospitalDTO.java → cif-api/src/main/java/com/txz/cif/dto/OrgHospitalDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-11
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/OrgUserDTO.java → cif-api/src/main/java/com/txz/cif/dto/OrgUserDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/Result.java → cif-api/src/main/java/com/txz/cif/dto/Result.java

@@ -1,4 +1,4 @@
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 
 import lombok.Builder;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/SalesmanDTO.java → cif-api/src/main/java/com/txz/cif/dto/SalesmanDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/SettleDTO.java → cif-api/src/main/java/com/txz/cif/dto/SettleDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-22
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/SettleInventoryDTO.java → cif-api/src/main/java/com/txz/cif/dto/SettleInventoryDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-18
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/SettlePlanDTO.java → cif-api/src/main/java/com/txz/cif/dto/SettlePlanDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-18
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/SubjectDTO.java → cif-api/src/main/java/com/txz/cif/dto/SubjectDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-12-13
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/SysMessageDTO.java → cif-api/src/main/java/com/txz/cif/dto/SysMessageDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2023-02-08
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/SysMessageTemplateDTO.java → cif-api/src/main/java/com/txz/cif/dto/SysMessageTemplateDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2023-02-08
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/UserDTO.java → cif-api/src/main/java/com/txz/cif/dto/UserDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import lombok.Data;
 

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/UserFriendDTO.java → cif-api/src/main/java/com/txz/cif/dto/UserFriendDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-08-30
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/UserFriendDeleteRecordDTO.java → cif-api/src/main/java/com/txz/cif/dto/UserFriendDeleteRecordDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-08-30
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/UserFriendRequestDTO.java → cif-api/src/main/java/com/txz/cif/dto/UserFriendRequestDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-08-30
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/UserGroupDTO.java → cif-api/src/main/java/com/txz/cif/dto/UserGroupDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-08-29
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/UserGroupMemberDTO.java → cif-api/src/main/java/com/txz/cif/dto/UserGroupMemberDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-08-29
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/UserIntroductoryDTO.java → cif-api/src/main/java/com/txz/cif/dto/UserIntroductoryDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/UserLogDTO.java → cif-api/src/main/java/com/txz/cif/dto/UserLogDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/UserOperatorDTO.java → cif-api/src/main/java/com/txz/cif/dto/UserOperatorDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/UserSignatureDTO.java → cif-api/src/main/java/com/txz/cif/dto/UserSignatureDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/dto/WxMchDTO.java → cif-api/src/main/java/com/txz/cif/dto/WxMchDTO.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2023-03-21
 */
-package com.medipath.cif.dto;
+package com.txz.cif.dto;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 3
cif-api/src/main/java/com/medipath/cif/enums/BizTypeEnum.java → cif-api/src/main/java/com/txz/cif/enums/BizTypeEnum.java

@@ -1,6 +1,4 @@
-package com.medipath.cif.enums;
-
-import lombok.Data;
+package com.txz.cif.enums;
 
 /**
  * 支付业务类型枚举类

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/param/CommissionParam.java → cif-api/src/main/java/com/txz/cif/param/CommissionParam.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.param;
+package com.txz.cif.param;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/param/FeeParam.java → cif-api/src/main/java/com/txz/cif/param/FeeParam.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.param;
+package com.txz.cif.param;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/param/FreezdParam.java → cif-api/src/main/java/com/txz/cif/param/FreezdParam.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.param;
+package com.txz.cif.param;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/param/MessageParam.java → cif-api/src/main/java/com/txz/cif/param/MessageParam.java

@@ -1,4 +1,4 @@
-package com.medipath.cif.param;
+package com.txz.cif.param;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/param/RechargeParam.java → cif-api/src/main/java/com/txz/cif/param/RechargeParam.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.param;
+package com.txz.cif.param;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/param/TransParam.java → cif-api/src/main/java/com/txz/cif/param/TransParam.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.param;
+package com.txz.cif.param;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 1 - 3
cif-api/src/main/java/com/medipath/cif/param/UnFreezdAndTransParam.java → cif-api/src/main/java/com/txz/cif/param/UnFreezdAndTransParam.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.param;
+package com.txz.cif.param;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -12,8 +12,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 @Data

+ 1 - 1
cif-api/src/main/java/com/medipath/cif/param/WithdrawParam.java → cif-api/src/main/java/com/txz/cif/param/WithdrawParam.java

@@ -4,7 +4,7 @@
 * Copyright(C) 2017-2020 fendo公司
 * @date 2022-11-02
 */
-package com.medipath.cif.param;
+package com.txz.cif.param;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

+ 4 - 4
cif-api/src/main/java/com/medipath/cif/service/AccountDubboService.java → cif-api/src/main/java/com/txz/cif/service/AccountDubboService.java

@@ -1,11 +1,11 @@
-package com.medipath.cif.service;
+package com.txz.cif.service;
 
 
-import com.medipath.cif.dto.*;
-import com.medipath.cif.param.*;
+import com.txz.cif.dto.AccountDTO;
+import com.txz.cif.dto.Result;
+import com.txz.cif.param.*;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 public interface AccountDubboService {
 

+ 11 - 0
cif-api/src/main/java/com/txz/cif/service/OrgDubboService.java

@@ -0,0 +1,11 @@
+//package com.medipath.cif.service;
+//
+//import com.medipath.cif.dto.OrgDTO;
+//
+//public interface OrgDubboService {
+//
+//    void saveOrgHospital(Long orgId,Long hospitalId, Integer type);
+//
+//    OrgDTO getOrgById(Long orgId);
+//
+//}

+ 2 - 8
cif-api/src/main/java/com/medipath/cif/service/SettleDubboService.java → cif-api/src/main/java/com/txz/cif/service/SettleDubboService.java

@@ -1,8 +1,7 @@
-package com.medipath.cif.service;
+package com.txz.cif.service;
 
 
-import com.medipath.cif.dto.*;
-import com.medipath.cif.param.*;
+import com.txz.cif.dto.SettleDTO;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -21,11 +20,6 @@ public interface SettleDubboService {
      */
     BigDecimal getAmount(Long planId, Integer size, Integer sysType, Integer bizType);
 
-    /**
-     * 保存结算记录
-     * @param settles
-     */
-    void saveSettle(String month,List<SettleDTO> settles);
 
     List<SettleDTO> settleList( Long orgId , Long userId, String year , String orderby);
 

+ 27 - 0
cif-api/src/main/java/com/txz/cif/service/UserDubboService.java

@@ -0,0 +1,27 @@
+package com.txz.cif.service;
+
+
+import com.txz.cif.dto.Result;
+import com.txz.cif.dto.UserDTO;
+
+public interface UserDubboService {
+
+    /**
+     * 验证登录
+     * @param token
+     * @return
+     */
+    Result<UserDTO> validateLogin(String token);
+
+    UserDTO getUser(Long userId);
+
+//    OrgDTO getOrgByUserId(Long userId);
+
+//    HospitalDTO getHospitalByUserId(Long userId);
+
+//    HospitalDTO getHospitalById(Long hospitalId);
+
+//    void updateLastTime(Long userId);
+
+//    boolean sendMsg(MessageParam param);
+}

+ 10 - 31
cif-service/pom.xml

@@ -4,7 +4,7 @@
 
     <parent>
         <artifactId>cif</artifactId>
-        <groupId>com.medipath</groupId>
+        <groupId>com.txz</groupId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -96,31 +96,10 @@
 
         <!--异维科技公共包依赖-->
         <dependency>
-            <groupId>com.medipath</groupId>
+            <groupId>com.txz</groupId>
             <artifactId>common</artifactId>
             <version>1.0.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-redis</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-lang3</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>javax.servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>google-collections</artifactId>
-                    <groupId>com.google.collections</groupId>
-                </exclusion>
-                <exclusion>
-                    <groupId>cn.hutool</groupId>
-                    <artifactId>hutool-all</artifactId>
-                </exclusion>
-            </exclusions>
+
         </dependency>
         <!--        IJPay-AliPay里引用 和undertow的版本冲突-->
         <dependency>
@@ -140,23 +119,23 @@
 
         <!--异维科技dubbo接口包依赖-->
         <dependency>
-            <groupId>com.medipath</groupId>
+            <groupId>com.txz</groupId>
             <artifactId>operating-api</artifactId>
             <version>1.0.0-SNAPSHOT</version>
 
         </dependency>
 
-        <dependency>
-            <groupId>com.medipath</groupId>
-            <artifactId>diagnosis-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.txz</groupId>-->
+<!--            <artifactId>diagnosis-api</artifactId>-->
+<!--            <version>1.0.0-SNAPSHOT</version>-->
+<!--        </dependency>-->
 
 
 
         <!--异维科技dubbo接口包依赖-->
         <dependency>
-            <groupId>com.medipath</groupId>
+            <groupId>com.txz</groupId>
             <artifactId>cif-api</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/AccountFreezdMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.AccountFreezd;
-
-public interface AccountFreezdMapper extends Mapper<AccountFreezd> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/ApplicationMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.Application;
-
-public interface ApplicationMapper extends Mapper<Application> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/BannerMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.Banner;
-
-public interface BannerMapper extends Mapper<Banner> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/FlowMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.Flow;
-
-public interface FlowMapper extends Mapper<Flow> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/GoodsMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.Goods;
-
-public interface GoodsMapper extends Mapper<Goods> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/HospitalMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.Hospital;
-
-public interface HospitalMapper extends Mapper<Hospital> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/MenuMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.Menu;
-
-public interface MenuMapper extends Mapper<Menu> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/NumberRuleMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.NumberRule;
-
-public interface NumberRuleMapper extends Mapper<NumberRule> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/OperatorMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.Operator;
-
-public interface OperatorMapper extends Mapper<Operator> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/OrderMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.Order;
-
-public interface OrderMapper extends Mapper<Order> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/OrgHospitalMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.OrgHospital;
-
-public interface OrgHospitalMapper extends Mapper<OrgHospital> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/OrgMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.Org;
-
-public interface OrgMapper extends Mapper<Org> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/OrgUserMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.OrgUser;
-
-public interface OrgUserMapper extends Mapper<OrgUser> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/SalesmanMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.Salesman;
-
-public interface SalesmanMapper extends Mapper<Salesman> {
-}

+ 0 - 8
cif-service/src/main/java/com/medipath/cif/dao/SequenceMapper.java

@@ -1,8 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.Sequence;
-
-public interface SequenceMapper extends Mapper<Sequence> {
-    int replaceInto(Sequence sequence);
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/SettleInventoryMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.SettleInventory;
-
-public interface SettleInventoryMapper extends Mapper<SettleInventory> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/SettleMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.Settle;
-
-public interface SettleMapper extends Mapper<Settle> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/SettlePlanMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.SettlePlan;
-
-public interface SettlePlanMapper extends Mapper<SettlePlan> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/SubjectMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.Subject;
-
-public interface SubjectMapper extends Mapper<Subject> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/SysMessageMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.SysMessage;
-
-public interface SysMessageMapper extends Mapper<SysMessage> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/SysMessageTemplateMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.SysMessageTemplate;
-
-public interface SysMessageTemplateMapper extends Mapper<SysMessageTemplate> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/UserLogMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.UserLog;
-
-public interface UserLogMapper extends Mapper<UserLog> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/UserMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.User;
-
-public interface UserMapper extends Mapper<User> {
-}

+ 0 - 7
cif-service/src/main/java/com/medipath/cif/dao/WxMchMapper.java

@@ -1,7 +0,0 @@
-package com.medipath.cif.dao;
-
-import com.medipath.cif.core.Mapper;
-import com.medipath.cif.model.WxMch;
-
-public interface WxMchMapper extends Mapper<WxMch> {
-}

+ 0 - 19
cif-service/src/main/java/com/medipath/cif/dubbo/client/AreaDubboServiceClient.java

@@ -1,19 +0,0 @@
-package com.medipath.cif.dubbo.client;
-
-
-import com.medipath.operating.service.AreaDubboService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.Reference;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-public class AreaDubboServiceClient {
-
-    @Reference
-    private AreaDubboService areaDubboService;
-
-    public String getAddress(String areaCode){
-        return areaDubboService.getAddress(areaCode);
-    }
-}

+ 0 - 25
cif-service/src/main/java/com/medipath/cif/dubbo/client/CaseDubboServiceClient.java

@@ -1,25 +0,0 @@
-package com.medipath.cif.dubbo.client;
-
-
-import com.medipath.diagnosis.service.CaseDubboService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.Reference;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-
-@Slf4j
-@Component
-public class CaseDubboServiceClient {
-
-    @Reference
-    private CaseDubboService caseDubboService;
-
-    public boolean isBusy(Long userId, Date time){
-        return caseDubboService.isBusy(userId,time);
-    }
-
-    public Integer queryIssueCount( Long hospitalId,  String startTime, String endTime){
-        return caseDubboService.queryIssueCount(hospitalId,startTime,endTime);
-    }
-}

+ 0 - 33
cif-service/src/main/java/com/medipath/cif/dubbo/client/DeviceDubboServiceClient.java

@@ -1,33 +0,0 @@
-package com.medipath.cif.dubbo.client;
-
-
-import com.medipath.operating.dto.DeviceDTO;
-import com.medipath.operating.dto.UkeyDTO;
-import com.medipath.operating.service.AreaDubboService;
-import com.medipath.operating.service.DeviceDubboService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.Reference;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-
-@Slf4j
-@Component
-public class DeviceDubboServiceClient {
-
-    @Reference
-    private DeviceDubboService deviceDubboService;
-
-    public DeviceDTO getDevice(String serialnumber){
-        return deviceDubboService.getDevice(serialnumber);
-    }
-
-    public Boolean sellUkey(String ukeySerial, Integer orderId, Integer deviceId, Date sellTime){
-        return deviceDubboService.sellUkey(ukeySerial,orderId,deviceId,sellTime);
-    }
-
-    public UkeyDTO getUkeyDevice(String serialnumber){
-        return deviceDubboService.getUkeyDevice(serialnumber);
-    }
-
-}

+ 0 - 21
cif-service/src/main/java/com/medipath/cif/dubbo/client/MessageDubboServiceClient.java

@@ -1,21 +0,0 @@
-package com.medipath.cif.dubbo.client;
-
-
-import com.medipath.operating.request.MessageRequest;
-import com.medipath.operating.service.AreaDubboService;
-import com.medipath.operating.service.MessageDubboService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.Reference;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-public class MessageDubboServiceClient {
-
-    @Reference
-    private MessageDubboService messageDubboService;
-
-    public boolean sendMsg(MessageRequest request){
-        return messageDubboService.sendMsg(request);
-    }
-}

+ 0 - 51
cif-service/src/main/java/com/medipath/cif/dubbo/impl/OrgDubboServiceImpl.java

@@ -1,51 +0,0 @@
-package com.medipath.cif.dubbo.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUnit;
-import cn.hutool.core.date.DateUtil;
-import com.medipath.cif.dto.OrgDTO;
-import com.medipath.cif.model.Org;
-import com.medipath.cif.model.OrgHospital;
-import com.medipath.cif.service.*;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.Service;
-import tk.mybatis.mapper.entity.Condition;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Slf4j
-@Service
-public class OrgDubboServiceImpl implements OrgDubboService {
-
-    @Resource
-    private OrgHospitalService orgHospitalService;
-
-    @Resource
-    private OrgService orgService;
-
-    @Override
-    public void saveOrgHospital(Long orgId, Long hospitalId, Integer type) {
-        try {
-            Condition c = new Condition(OrgHospital.class);
-            c.createCriteria().andEqualTo("orgId",orgId).andEqualTo("hospitalId",hospitalId)
-                    .andEqualTo("type",type);
-            List<OrgHospital> list = orgHospitalService.findByCondition(c);
-            if (CollUtil.isEmpty(list)){
-                orgHospitalService.save(OrgHospital.builder().orgId(orgId).hospitalId(hospitalId).type(type).build());
-            }
-        }catch (Exception e){
-            log.error("[saveOrgHospital]异常",e);
-        }
-    }
-
-    @Override
-    public OrgDTO getOrgById(Long orgId) {
-        Org org = orgService.findById(orgId);
-        if (org == null){
-            return null;
-        }
-        return BeanUtil.toBean(org,OrgDTO.class);
-    }
-}

+ 0 - 174
cif-service/src/main/java/com/medipath/cif/dubbo/impl/SettleDubboServiceImpl.java

@@ -1,174 +0,0 @@
-package com.medipath.cif.dubbo.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.medipath.cif.core.ResultCode;
-import com.medipath.cif.core.ResultGenerator;
-import com.medipath.cif.core.ServiceException;
-import com.medipath.cif.dto.OrgDTO;
-import com.medipath.cif.dto.SettleDTO;
-import com.medipath.cif.model.*;
-import com.medipath.cif.service.*;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.Service;
-import tk.mybatis.mapper.entity.Condition;
-import tk.mybatis.mapper.entity.Example;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Service
-public class SettleDubboServiceImpl implements SettleDubboService {
-
-    @Resource
-    private SettleInventoryService settleInventoryService;
-
-    @Resource
-    private SettleService settleService;
-
-    @Resource
-    private OrgService orgService;
-
-    @Resource
-    private OrgUserService orgUserService;
-
-    @Override
-    public BigDecimal getAmount(Long planId, Integer size, Integer sysType,
-                                          Integer bizType) {
-        Condition c = new Condition(SettleInventory.class);
-        c.createCriteria().andEqualTo("planId",planId).andEqualTo("sysType",sysType)
-                .andEqualTo("bizType",bizType)
-                .andLessThanOrEqualTo("startSize",size)
-                .andGreaterThanOrEqualTo("endSize",size);
-        List<SettleInventory> inventories = settleInventoryService.findByCondition(c);
-        if (CollUtil.isEmpty(inventories)){
-            return null;
-        }
-        return inventories.get(0).getAmount();
-    }
-
-    @Override
-    public void saveSettle(String month,List<SettleDTO> settles) {
-        Condition c = new Condition(Settle.class);
-        c.createCriteria().andEqualTo("month",month);
-        List<Settle> settleList = settleService.findByCondition(c);
-        if (CollUtil.isNotEmpty(settleList)){
-            throw new ServiceException(ResultCode.SETTLE_HAVE_DATA);
-        }
-        c = new Condition(Org.class);
-        c.createCriteria().andEqualTo("status",1);
-        List<Org> orgs = orgService.findByCondition(c);
-        if (CollUtil.isEmpty(orgs)){
-            return;
-        }
-        Date now = DateUtil.date();
-        List<Settle> save = new ArrayList<>();
-        for (Org org:orgs) {
-            if (org.getType() == 1){
-                c = new Condition(OrgUser.class);
-                c.createCriteria().andEqualTo("orgId",org.getId());
-                List<OrgUser> orgUsers =orgUserService.findByCondition(c);
-                if (CollUtil.isEmpty(orgUsers)){
-                    continue;
-                }
-                for (OrgUser orgUser:orgUsers) {
-                    //请求获取结算数据
-                    //flag = 已有数据
-                    Boolean flag = false;
-                    if (CollUtil.isNotEmpty(settles)){
-                        for (SettleDTO temp:settles ) {
-                            if (temp.getOrgId().compareTo(orgUser.getOrgId())== 0
-                                && temp.getUserId().compareTo(orgUser.getUserId())==0){
-                                save.add(Settle.builder().createTime(now)
-                                        .finishAmount(temp.getFinishAmount())
-                                        .finishSize(temp.getFinishSize())
-                                        .month(month)
-                                        .orgId(orgUser.getOrgId())
-                                        .userId(orgUser.getUserId())
-                                        .updateTime(now)
-                                        .status(1)
-                                        .build());
-                                flag = true;
-                            }
-                        }
-                    }
-                    if (!flag){
-                        save.add(Settle.builder().createTime(now)
-                                .finishAmount(BigDecimal.ZERO)
-                                .finishSize(0)
-                                .month(month)
-                                .orgId(orgUser.getOrgId())
-                                .userId(orgUser.getUserId())
-                                .updateTime(now)
-                                .status(2)
-                                .build());
-                    }
-                }
-            } else {
-                //请求获取结算数据
-                Boolean flag = false;
-                for (SettleDTO temp:settles ) {
-                    if (temp.getOrgId().compareTo(org.getId())== 0
-                        && temp.getUserId().compareTo(org.getUserId())==0){
-                        save.add(Settle.builder().createTime(now)
-                                .finishAmount(temp.getFinishAmount())
-                                .finishSize(temp.getFinishSize())
-                                .month(month)
-                                .orgId(org.getId())
-                                .userId(org.getUserId())
-                                .updateTime(now)
-                                .status(1)
-                                .build());
-                        flag = true;
-                    }
-                }
-                if (!flag){
-                    save.add(Settle.builder().createTime(now)
-                            .finishAmount(BigDecimal.ZERO)
-                            .finishSize(0)
-                            .month(month)
-                            .orgId(org.getId())
-                            .userId(org.getUserId())
-                            .updateTime(now)
-                            .status(2)
-                            .build());
-                }
-            }
-        }
-        if (CollUtil.isNotEmpty(save)){
-            settleService.save(save);
-        }
-    }
-
-    @Override
-    public List<SettleDTO> settleList(Long orgId, Long userId, String year, String orderby) {
-
-        Condition condition = new Condition(Settle.class);
-        Example.Criteria criteria = condition.createCriteria();
-        if (orgId!= null){
-            criteria.andEqualTo("orgId", orgId);
-        }
-        if (userId!= null){
-            criteria.andEqualTo("userId", userId);
-        }
-        if (StrUtil.isNotBlank(year)){
-            criteria.andGreaterThanOrEqualTo("month",year+"-01-01 00:00:00");
-            criteria.andLessThanOrEqualTo("month",year+"-12-31 23:59:59");
-        }
-        if (StrUtil.isNotBlank(orderby)){
-            condition.setOrderByClause(orderby);
-        }
-        List<Settle> list = settleService.findByCondition(condition);
-        if (CollUtil.isEmpty(list)){
-            return null;
-        }
-        return list.stream().map(temp -> BeanUtil.toBean(temp,SettleDTO.class)).collect(Collectors.toList());
-    }
-}

+ 0 - 112
cif-service/src/main/java/com/medipath/cif/dubbo/impl/UserDubboServiceImpl.java

@@ -1,112 +0,0 @@
-package com.medipath.cif.dubbo.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.json.JSONUtil;
-import com.medipath.cif.core.RedisUtil;
-import com.medipath.cif.core.cache.CacheKey;
-import com.medipath.cif.core.cache.CacheType;
-import com.medipath.cif.dto.HospitalDTO;
-import com.medipath.cif.dto.OrgDTO;
-import com.medipath.cif.dto.Result;
-import com.medipath.cif.dto.UserDTO;
-import com.medipath.cif.model.Hospital;
-import com.medipath.cif.model.Org;
-import com.medipath.cif.model.User;
-import com.medipath.cif.param.MessageParam;
-import com.medipath.cif.service.HospitalService;
-import com.medipath.cif.service.OrgService;
-import com.medipath.cif.service.UserDubboService;
-import com.medipath.cif.service.UserService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.Service;
-
-import javax.annotation.Resource;
-
-@Slf4j
-@Service(timeout = 1200000)
-public class UserDubboServiceImpl implements UserDubboService {
-
-    @Resource
-    private RedisUtil redisUtil;
-
-    @Resource
-    private UserService userService;
-
-    @Resource
-    private OrgService orgService;
-
-    @Resource
-    private HospitalService hospitalService;
-
-
-    @Override
-    public Result<UserDTO> validateLogin(String token) {
-        CacheKey key = CacheKey.generateKey(CacheType.UserToken, token);
-        Object j = redisUtil.get(key.toString());
-        if (j  != null) {
-            User user = userService.findById(Long.parseLong( j.toString()));
-            if (user != null){
-                return Result.genSuccessResult(BeanUtil.toBean(user,UserDTO.class));
-            } else {
-                return Result.genFailResult("用户未找到");
-            }
-        } else {
-            return Result.genFailResult("用户未登录");
-        }
-    }
-
-    @Override
-    public UserDTO getUser(Long userId) {
-        User user = userService.findById(userId);
-        if (user == null){
-            return null;
-        }
-        UserDTO userDTO =  BeanUtil.toBean(user,UserDTO.class);
-        userDTO.setHeadPic(user.getIcon());
-        return userDTO;
-    }
-
-    @Override
-    public OrgDTO getOrgByUserId(Long userId) {
-        Org org = orgService.findBy("userId",userId);
-        if (org == null){
-            return null;
-        }
-        return BeanUtil.toBean(org,OrgDTO.class);
-    }
-
-    @Override
-    public HospitalDTO getHospitalByUserId(Long userId) {
-        Hospital hospital = hospitalService.findBy("userId",userId);
-        if (hospital == null){
-            return null;
-        }
-        return BeanUtil.toBean(hospital,HospitalDTO.class);
-    }
-
-    @Override
-    public HospitalDTO getHospitalById(Long hospitalId) {
-        Hospital hospital = hospitalService.findById(hospitalId);
-        if (hospital == null){
-            return null;
-        }
-        return BeanUtil.toBean(hospital,HospitalDTO.class);
-    }
-
-    @Override
-    public void updateLastTime(Long userId) {
-        User user = userService.findById(userId);
-        if (user == null){
-            return ;
-        }
-        userService.update(User.builder().id(userId).lastTime(DateUtil.date()).build());
-    }
-
-    @Override
-    public boolean sendMsg(MessageParam param) {
-        log.error("[发生消息]入参"+ JSONUtil.toJsonStr(param));
-        return userService.sendMsg(param);
-    }
-
-}

+ 0 - 148
cif-service/src/main/java/com/medipath/cif/model/Hospital.java

@@ -1,148 +0,0 @@
-package com.medipath.cif.model;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.medipath.cif.web.bo.HospitalBO;
-import com.medipath.cif.web.bo.OrgBO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import java.util.Date;
-import javax.persistence.*;
-
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="com.medipath.cif.model.Hospital")
-@Table(name = "c_hospital")
-public class Hospital {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Long id;
-
-    /**
-     * 管理账号用户id(关联登录账号,结算账户)
-     */
-    @Column(name = "user_id")
-    @ApiModelProperty(value="userId管理账号用户id(关联登录账号,结算账户)")
-    private Long userId;
-
-
-    @Column(name = "device_id")
-    @ApiModelProperty(value="插件id")
-    private String deviceId;
-
-    /**
-     * 结算方案id
-     */
-    @Column(name = "settle_plan_id")
-    @ApiModelProperty(value="settlePlanId结算方案id")
-    private Long settlePlanId;
-
-    /**
-     * 医院名称
-     */
-    @ApiModelProperty(value="name医院名称")
-    private String name;
-
-
-    @ApiModelProperty(value="科室名称")
-    private String department;
-
-
-    /**
-     * 地址
-     */
-    @ApiModelProperty(value="address地址")
-    private String address;
-
-    /**
-     * 图标
-     */
-    @ApiModelProperty(value="icon图标")
-    private String icon;
-
-    /**
-     * 状态 1正常 2禁用
-     */
-    @ApiModelProperty(value="status状态 1正常 2禁用")
-    private Integer status;
-
-    /**
-     * 类型 1区域中心 2省级中心 3会诊医院
-     */
-    @ApiModelProperty(value="type类型 1区域中心 2省级中心 3会诊医院")
-    private Integer type;
-
-    /**
-     * 分类 多个分类 使用 , 分割
-     */
-    @Column(name = "sys_types")
-    @ApiModelProperty(value="sysTypes分类 多个分类 使用 , 分割")
-    private String sysTypes;
-
-    /**
-     * 区域码
-     */
-    @Column(name = "area_code")
-    @ApiModelProperty(value="areaCode区域码")
-    private String areaCode;
-
-    /**
-     * 省地区码
-     */
-    @Column(name = "province_code")
-    @ApiModelProperty(value="provinceCode省地区码")
-    private String provinceCode;
-
-    /**
-     * 城市地区码
-     */
-    @Column(name = "city_code")
-    @ApiModelProperty(value="cityCode城市地区码")
-    private String cityCode;
-
-    /**
-     * 公告
-     */
-    @ApiModelProperty(value="notice公告")
-    private String notice;
-
-    /**
-     * 创建时间
-     */
-    @Column(name = "create_time")
-    @ApiModelProperty(value="createTime创建时间")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @Column(name = "update_time")
-    @ApiModelProperty(value="updateTime更新时间")
-    private Date updateTime;
-
-    /**
-     * 简介
-     */
-    @ApiModelProperty(value="introductory简介")
-    private String introductory;
-
-    /**
-     * 科室简介
-     */
-    @Column(name = "office_intro")
-    @ApiModelProperty(value="officeIntro科室简介")
-    private String officeIntro;
-
-
-    public HospitalBO generator() {
-        HospitalBO bo = BeanUtil.toBean(this,HospitalBO.class);
-        bo.setHospitalId(this.id);
-        return bo;
-    }
-}

+ 0 - 141
cif-service/src/main/java/com/medipath/cif/model/Org.java

@@ -1,141 +0,0 @@
-package com.medipath.cif.model;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.medipath.cif.web.bo.OrgBO;
-import com.medipath.cif.web.bo.OrgInfoBO;
-import com.medipath.cif.web.bo.UserInfoBO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.persistence.*;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="com.medipath.cif.model.Org")
-@Table(name = "c_org")
-public class Org {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Long id;
-
-
-    @Column(name = "settle_plan_id")
-    @ApiModelProperty(value="结算方案id")
-    private Long settlePlanId;
-
-
-
-    /**
-     * 管理员用户id自动生成
-     */
-    @Column(name = "user_id")
-    @ApiModelProperty(value="管理员用户id自动生成")
-    private Long userId;
-
-    /**
-     * 组织名称
-     */
-    @ApiModelProperty(value="name组织名称")
-    private String name;
-
-    @ApiModelProperty(value="特长")
-    private String strong;
-
-    @Column(name = "sys_types")
-    @ApiModelProperty(value="系统分类 多个分类 使用 , 分割")
-    private String sysTypes;
-
-
-    /**
-     * 地址
-     */
-    @ApiModelProperty(value="address地址")
-    private String address;
-
-    /**
-     * 所属省份代码
-     */
-    @Column(name = "province_code")
-    @ApiModelProperty(value="provinceCode所属省份代码")
-    private String provinceCode;
-
-    /**
-     * 所属城市码
-     */
-    @Column(name = "city_code")
-    @ApiModelProperty(value="cityCode所属城市码")
-    private String cityCode;
-
-    /**
-     * 所属区域代码
-     */
-    @Column(name = "area_code")
-    @ApiModelProperty(value="areaCode所属区域代码")
-    private String areaCode;
-
-    /**
-     * 图标
-     */
-    @ApiModelProperty(value="icon图标")
-    private String icon;
-
-    /**
-     * 状态 1正常 2禁用
-     */
-    @ApiModelProperty(value="status状态 1正常 2禁用")
-    private Integer status;
-
-    /**
-     * 类型1群组 2专家
-     */
-    @ApiModelProperty(value="type类型 1群组 2专家")
-    private Integer type;
-
-    /**
-     * 公告
-     */
-    @ApiModelProperty(value="notice公告")
-    private String notice;
-
-    /**
-     * 销售员id
-     */
-    @Column(name = "salesman_id")
-    @ApiModelProperty(value="salesmanId销售员id")
-    private Long salesmanId;
-
-    /**
-     * 创建时间
-     */
-    @Column(name = "create_time")
-    @ApiModelProperty(value="createTime创建时间")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @Column(name = "update_time")
-    @ApiModelProperty(value="updateTime更新时间")
-    private Date updateTime;
-
-    public OrgBO generator() {
-        OrgBO bo = BeanUtil.toBean(this,OrgBO.class);
-        bo.setOrgId(this.id);
-        return bo;
-    }
-
-    public OrgInfoBO generatorInfo() {
-        OrgInfoBO bo = BeanUtil.toBean(this,OrgInfoBO.class);
-        bo.setOrgId(this.id);
-        return bo;
-    }
-
-
-}

+ 0 - 75
cif-service/src/main/java/com/medipath/cif/model/OrgHospital.java

@@ -1,75 +0,0 @@
-package com.medipath.cif.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import javax.persistence.*;
-
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="com.medipath.cif.model.OrgHospital")
-@Table(name = "c_org_hospital")
-public class OrgHospital {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Long id;
-
-    @Column(name = "org_id")
-    @ApiModelProperty(value="orgId")
-    private Long orgId;
-
-    @Column(name = "hospital_id")
-    @ApiModelProperty(value="hospitalId")
-    private Long hospitalId;
-
-    @ApiModelProperty(value="type")
-    private Integer type;
-
-    /**
-     * @return id
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * @return org_id
-     */
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    /**
-     * @param orgId
-     */
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    /**
-     * @return hospital_id
-     */
-    public Long getHospitalId() {
-        return hospitalId;
-    }
-
-    /**
-     * @param hospitalId
-     */
-    public void setHospitalId(Long hospitalId) {
-        this.hospitalId = hospitalId;
-    }
-}

+ 0 - 40
cif-service/src/main/java/com/medipath/cif/model/OrgUser.java

@@ -1,40 +0,0 @@
-package com.medipath.cif.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.persistence.*;
-
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="com.medipath.cif.model.OrgUser")
-@Table(name = "c_org_user")
-public class OrgUser {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Long id;
-
-    /**
-     * 组织id
-     */
-    @Column(name = "org_id")
-    @ApiModelProperty(value="orgId组织id")
-    private Long orgId;
-
-    /**
-     * 用户id
-     */
-    @Column(name = "user_id")
-    @ApiModelProperty(value="userId用户id")
-    private Long userId;
-
-
-}

+ 0 - 155
cif-service/src/main/java/com/medipath/cif/model/Salesman.java

@@ -1,155 +0,0 @@
-package com.medipath.cif.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import javax.persistence.*;
-
-@ApiModel(value="com.medipath.cif.model.Salesman")
-@Table(name = "c_salesman")
-public class Salesman {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Long id;
-
-    @ApiModelProperty(value="name")
-    private String name;
-
-    /**
-     * 资金账户(目前只有一个)
-     */
-    @Column(name = "account_id")
-    @ApiModelProperty(value="accountId资金账户(目前只有一个)")
-    private Long accountId;
-
-    /**
-     * 状态 1正常 2禁用
-     */
-    @ApiModelProperty(value="status状态 1正常 2禁用")
-    private Integer status;
-
-    /**
-     * 电话
-     */
-    @Column(name = "phone_no")
-    @ApiModelProperty(value="phoneNo电话")
-    private String phoneNo;
-
-    @ApiModelProperty(value="email")
-    private String email;
-
-    @Column(name = "creat_time")
-    @ApiModelProperty(value="creatTime")
-    private Date creatTime;
-
-    /**
-     * @return id
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * @return name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * @param name
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 获取资金账户(目前只有一个)
-     *
-     * @return account_id - 资金账户(目前只有一个)
-     */
-    public Long getAccountId() {
-        return accountId;
-    }
-
-    /**
-     * 设置资金账户(目前只有一个)
-     *
-     * @param accountId 资金账户(目前只有一个)
-     */
-    public void setAccountId(Long accountId) {
-        this.accountId = accountId;
-    }
-
-    /**
-     * 获取状态 1正常 2禁用
-     *
-     * @return status - 状态 1正常 2禁用
-     */
-    public Integer getStatus() {
-        return status;
-    }
-
-    /**
-     * 设置状态 1正常 2禁用
-     *
-     * @param status 状态 1正常 2禁用
-     */
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    /**
-     * 获取电话
-     *
-     * @return phone_no - 电话
-     */
-    public String getPhoneNo() {
-        return phoneNo;
-    }
-
-    /**
-     * 设置电话
-     *
-     * @param phoneNo 电话
-     */
-    public void setPhoneNo(String phoneNo) {
-        this.phoneNo = phoneNo;
-    }
-
-    /**
-     * @return email
-     */
-    public String getEmail() {
-        return email;
-    }
-
-    /**
-     * @param email
-     */
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    /**
-     * @return creat_time
-     */
-    public Date getCreatTime() {
-        return creatTime;
-    }
-
-    /**
-     * @param creatTime
-     */
-    public void setCreatTime(Date creatTime) {
-        this.creatTime = creatTime;
-    }
-}

+ 0 - 212
cif-service/src/main/java/com/medipath/cif/model/WxMch.java

@@ -1,212 +0,0 @@
-package com.medipath.cif.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import java.util.Date;
-import javax.persistence.*;
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="com.medipath.cif.model.WxMch")
-@Table(name = "c_wx_mch")
-public class WxMch {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Long id;
-
-    /**
-     * 名字
-     */
-    @ApiModelProperty(value="name名字")
-    private String name;
-
-    /**
-     * appId
-     */
-    @Column(name = "app_id")
-    @ApiModelProperty(value="appIdappId")
-    private String appId;
-
-    /**
-     * 商户id
-     */
-    @Column(name = "mch_id")
-    @ApiModelProperty(value="mchId商户id")
-    private String mchId;
-
-    @Column(name = "api_key")
-    @ApiModelProperty(value="apiKey")
-    private String apiKey;
-
-    /**
-     * p12证书路径
-     */
-    @Column(name = "key_path")
-    @ApiModelProperty(value="keyPathp12证书路径")
-    private String keyPath;
-
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value="remark备注")
-    private String remark;
-
-    @Column(name = "create_time")
-    @ApiModelProperty(value="createTime")
-    private Date createTime;
-
-    @Column(name = "update_time")
-    @ApiModelProperty(value="updateTime")
-    private Date updateTime;
-
-    /**
-     * @return id
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取名字
-     *
-     * @return name - 名字
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * 设置名字
-     *
-     * @param name 名字
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 获取appId
-     *
-     * @return app_id - appId
-     */
-    public String getAppId() {
-        return appId;
-    }
-
-    /**
-     * 设置appId
-     *
-     * @param appId appId
-     */
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    /**
-     * 获取商户id
-     *
-     * @return mch_id - 商户id
-     */
-    public String getMchId() {
-        return mchId;
-    }
-
-    /**
-     * 设置商户id
-     *
-     * @param mchId 商户id
-     */
-    public void setMchId(String mchId) {
-        this.mchId = mchId;
-    }
-
-    /**
-     * @return api_key
-     */
-    public String getApiKey() {
-        return apiKey;
-    }
-
-    /**
-     * @param apiKey
-     */
-    public void setApiKey(String apiKey) {
-        this.apiKey = apiKey;
-    }
-
-    /**
-     * 获取p12证书路径
-     *
-     * @return key_path - p12证书路径
-     */
-    public String getKeyPath() {
-        return keyPath;
-    }
-
-    /**
-     * 设置p12证书路径
-     *
-     * @param keyPath p12证书路径
-     */
-    public void setKeyPath(String keyPath) {
-        this.keyPath = keyPath;
-    }
-
-    /**
-     * 获取备注
-     *
-     * @return remark - 备注
-     */
-    public String getRemark() {
-        return remark;
-    }
-
-    /**
-     * 设置备注
-     *
-     * @param remark 备注
-     */
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    /**
-     * @return create_time
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * @param createTime
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * @return update_time
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * @param updateTime
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-}

+ 0 - 11
cif-service/src/main/java/com/medipath/cif/service/HospitalService.java

@@ -1,11 +0,0 @@
-package com.medipath.cif.service;
-import com.medipath.cif.model.Hospital;
-import com.medipath.cif.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2022/11/11.
- */
-public interface HospitalService extends Service<Hospital> {
-
-}

+ 0 - 11
cif-service/src/main/java/com/medipath/cif/service/OrgHospitalService.java

@@ -1,11 +0,0 @@
-package com.medipath.cif.service;
-import com.medipath.cif.model.OrgHospital;
-import com.medipath.cif.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2022/11/11.
- */
-public interface OrgHospitalService extends Service<OrgHospital> {
-
-}

+ 0 - 11
cif-service/src/main/java/com/medipath/cif/service/OrgService.java

@@ -1,11 +0,0 @@
-package com.medipath.cif.service;
-import com.medipath.cif.model.Org;
-import com.medipath.cif.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2022/11/02.
- */
-public interface OrgService extends Service<Org> {
-
-}

+ 0 - 11
cif-service/src/main/java/com/medipath/cif/service/OrgUserService.java

@@ -1,11 +0,0 @@
-package com.medipath.cif.service;
-import com.medipath.cif.model.OrgUser;
-import com.medipath.cif.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2022/11/02.
- */
-public interface OrgUserService extends Service<OrgUser> {
-
-}

+ 0 - 11
cif-service/src/main/java/com/medipath/cif/service/SalesmanService.java

@@ -1,11 +0,0 @@
-package com.medipath.cif.service;
-import com.medipath.cif.model.Salesman;
-import com.medipath.cif.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2022/11/02.
- */
-public interface SalesmanService extends Service<Salesman> {
-
-}

+ 0 - 22
cif-service/src/main/java/com/medipath/cif/service/WxMchService.java

@@ -1,22 +0,0 @@
-package com.medipath.cif.service;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.medipath.cif.model.WxMch;
-import com.medipath.cif.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2023/03/21.
- */
-public interface WxMchService extends Service<WxMch> {
-
-    WxPayService switchoverTo(String appId, WxPayService wxPayService, Boolean refreshConfig) ;
-
-    /**
-     * 接口缓存1小时
-     *
-     * @param appId
-     * @return
-     */
-    WxMch getByAppId(String appId);
-}

+ 0 - 22
cif-service/src/main/java/com/medipath/cif/service/impl/HospitalServiceImpl.java

@@ -1,22 +0,0 @@
-package com.medipath.cif.service.impl;
-
-import com.medipath.cif.dao.HospitalMapper;
-import com.medipath.cif.model.Hospital;
-import com.medipath.cif.service.HospitalService;
-import com.medipath.cif.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-
-/**
- * Created by CodeGenerator on 2022/11/11.
- */
-@Service
-@Transactional
-public class HospitalServiceImpl extends AbstractService<Hospital> implements HospitalService {
-    @Resource
-    private HospitalMapper cHospitalMapper;
-
-}

+ 0 - 22
cif-service/src/main/java/com/medipath/cif/service/impl/OrgHospitalServiceImpl.java

@@ -1,22 +0,0 @@
-package com.medipath.cif.service.impl;
-
-import com.medipath.cif.dao.OrgHospitalMapper;
-import com.medipath.cif.model.OrgHospital;
-import com.medipath.cif.service.OrgHospitalService;
-import com.medipath.cif.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-
-/**
- * Created by CodeGenerator on 2022/11/11.
- */
-@Service
-@Transactional
-public class OrgHospitalServiceImpl extends AbstractService<OrgHospital> implements OrgHospitalService {
-    @Resource
-    private OrgHospitalMapper cOrgHospitalMapper;
-
-}

+ 0 - 22
cif-service/src/main/java/com/medipath/cif/service/impl/OrgServiceImpl.java

@@ -1,22 +0,0 @@
-package com.medipath.cif.service.impl;
-
-import com.medipath.cif.dao.OrgMapper;
-import com.medipath.cif.model.Org;
-import com.medipath.cif.service.OrgService;
-import com.medipath.cif.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-
-/**
- * Created by CodeGenerator on 2022/11/02.
- */
-@Service
-@Transactional
-public class OrgServiceImpl extends AbstractService<Org> implements OrgService {
-    @Resource
-    private OrgMapper cOrgMapper;
-
-}

+ 0 - 22
cif-service/src/main/java/com/medipath/cif/service/impl/OrgUserServiceImpl.java

@@ -1,22 +0,0 @@
-package com.medipath.cif.service.impl;
-
-import com.medipath.cif.dao.OrgUserMapper;
-import com.medipath.cif.model.OrgUser;
-import com.medipath.cif.service.OrgUserService;
-import com.medipath.cif.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-
-/**
- * Created by CodeGenerator on 2022/11/02.
- */
-@Service
-@Transactional
-public class OrgUserServiceImpl extends AbstractService<OrgUser> implements OrgUserService {
-    @Resource
-    private OrgUserMapper cOrgUserMapper;
-
-}

+ 0 - 22
cif-service/src/main/java/com/medipath/cif/service/impl/SalesmanServiceImpl.java

@@ -1,22 +0,0 @@
-package com.medipath.cif.service.impl;
-
-import com.medipath.cif.dao.SalesmanMapper;
-import com.medipath.cif.model.Salesman;
-import com.medipath.cif.service.SalesmanService;
-import com.medipath.cif.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-
-/**
- * Created by CodeGenerator on 2022/11/02.
- */
-@Service
-@Transactional
-public class SalesmanServiceImpl extends AbstractService<Salesman> implements SalesmanService {
-    @Resource
-    private SalesmanMapper cSalesmanMapper;
-
-}

+ 0 - 31
cif-service/src/main/java/com/medipath/cif/service/impl/SettleServiceImpl.java

@@ -1,31 +0,0 @@
-package com.medipath.cif.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import com.medipath.cif.core.ResultCode;
-import com.medipath.cif.core.ServiceException;
-import com.medipath.cif.dao.SettleMapper;
-import com.medipath.cif.model.Org;
-import com.medipath.cif.model.OrgUser;
-import com.medipath.cif.model.Settle;
-import com.medipath.cif.service.OrgService;
-import com.medipath.cif.service.OrgUserService;
-import com.medipath.cif.service.SettleService;
-import com.medipath.cif.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Condition;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * Created by CodeGenerator on 2022/11/22.
- */
-@Service
-@Transactional
-public class SettleServiceImpl extends AbstractService<Settle> implements SettleService {
-    @Resource
-    private SettleMapper cSettleMapper;
-
-
-}

部分文件因文件數量過多而無法顯示