Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

README.md

@@ -81,31 +81,34 @@
 
 | 数据库      | 类型   | 地址   |  账号  |  密码  |  说明  |
 | --------   | :-----: | :-----:  | :----:  | :----: | :------  |
-| saas_account | mysql | 192.168.253.12:3306 |  root  | select111*** |  账户中心  |
-| saas_auth | mysql | 192.168.253.12:3306 |  root  | select111*** |  鉴权系统  |
-| saas_file | mysql | 192.168.253.12:3306 |  root  | select111*** |  文件系统  |
-| saas_mail | mysql | 192.168.253.12:3306 |  root  | select111*** |  邮件系统  |
-| saas_biz | mysql | 192.168.253.12:3306 |  root  | select111*** |  业务系统  |
-| saas_ui | mongo | 192.168.253.12:27017 |    |  |  UI配置  |
+| saas_account | mysql | 192.168.0.172:3306 |  root  | select111*** |  账户中心  |
+| saas_auth | mysql | 192.168.0.172:3306 |  root  | select111*** |  鉴权系统  |
+| saas_file | mysql | 192.168.0.172:3306 |  root  | select111*** |  文件系统  |
+| saas_mail | mysql | 192.168.0.172:3306 |  root  | select111*** |  邮件系统  |
+| saas_biz | mysql | 192.168.0.172:3306 |  root  | select111*** |  业务系统  |
+| saas_ui | mongo | 192.168.0.183:27017 |    |  |  UI配置  |
 
 > 中间件
 
 | 类型 | 地址 | 账号 | 密码 | 说明 |
 | ---- | :----: | :----: | :----: | ---- |
 | rabbitmq | 192.168.0.176:5672 | saas | select123*** | 消息中间件 [控制台](http://192.168.0.176:15672)|
-| redis | 192.168.253.12:6379 | | | 内存数据库 |
+| redis | 192.168.0.182:6379 | | | 内存数据库 |
 
 
 > 服务器
 
 | IP      |  账号  |  密码  |  环境  |  资源  |
 | --------   | :----:  | :----: | :------:  | :------:  |
+| 192.168.0.172 |  root  | select123*** |  CentOS7, MySQL  | Cpu: 8, Mem: 16G, Disk: 80G |
 | 192.168.0.176 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
 | 192.168.0.177 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
 | 192.168.0.178 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
 | 192.168.0.179 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
 | 192.168.0.180 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
 | 192.168.0.181 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 80G |
+| 192.168.0.182 |  root  | select123*** |  CentOS7, Redis  | Cpu: 2, Mem: 8G, Disk: 20G |
+| 192.168.0.183 |  root  | select123*** |  CentOS7, Mongo  | Cpu: 4, Mem: 8G, Disk: 50G |
 
 > 构建
 

applications/commons/commons-server/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.253.12:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://192.168.0.172:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

applications/document/document-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.253.12:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://192.168.0.172:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:
@@ -21,7 +21,7 @@ spring:
   messages:
     basename: i18n/messages
   redis:
-    host: 192.168.253.12
+    host: 192.168.0.182
     port: 6379
   rabbitmq:
     host: 192.168.0.176

applications/money/money-server/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.253.12:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://192.168.0.172:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:
@@ -19,7 +19,7 @@ spring:
   messages:
     basename: i18n/messages
   redis:
-    host: 192.168.253.12
+    host: 192.168.0.182
     port: 6379
   rabbitmq:
     host: 192.168.0.176

applications/purchase/purchase-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.253.12:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://192.168.0.172:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -220,7 +220,6 @@ public class SaleServiceImpl implements SaleService{
     }
 
     @Override
-    @Transactional
     public DocBaseDTO audit(SaleFormDTO formData) {
         Long id = null;
         DocBaseDTO baseDTO = null;
@@ -235,6 +234,7 @@ public class SaleServiceImpl implements SaleService{
         return baseDTO;
     }
 
+    @Transactional
     private void singleAudit(Long id) {
         /*Sale sale = new Sale();
         //生成更新对象

applications/sale/sale-server/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.253.12:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://192.168.0.172:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

applications/storage/storage-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.253.12:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://192.168.0.172:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

base-servers/account/account-dto/src/main/java/com/usoftchina/saas/account/dto/CompanyRspDTO.java

@@ -43,13 +43,13 @@ public class CompanyRspDTO implements Serializable {
 
     private Long adminId;
 
-    private Long adminEmail;
+    private String adminEmail;
 
-    public Long getAdminEmail() {
+    public String getAdminEmail() {
         return adminEmail;
     }
 
-    public void setAdminEmail(Long adminEmail) {
+    public void setAdminEmail(String adminEmail) {
         this.adminEmail = adminEmail;
     }
 

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/AccountController.java

@@ -420,9 +420,9 @@ public class AccountController {
      */
     @PostMapping("/disable")
     public Result disableAccount(@RequestParam long accountId) {
-        accountService.disable(accountId);
+        //accountService.disable(accountId);
         //移除账户绑定的企业关系
-        accountService.unbindCompany(accountId, BaseContextHolder.getCompanyId());
+        accountService.updateBindCompanyStatus(accountId, BaseContextHolder.getCompanyId(), "0");
         //同步到优软云
         Long userUU = accountService.findByPrimaryKey(accountId).getUu();
         Long companyUU = companyService.findByPrimaryKey(BaseContextHolder.getCompanyId()).getUu();
@@ -439,9 +439,9 @@ public class AccountController {
      */
     @PostMapping("/enable")
     public Result enableAccount(@RequestParam long accountId) {
-        accountService.enable(accountId);
+        //accountService.enable(accountId);
         //添加账户绑定的企业关系
-        accountService.bindCompany(accountId, BaseContextHolder.getCompanyId());
+        accountService.updateBindCompanyStatus(accountId, BaseContextHolder.getCompanyId(), "1");
         //同步到优软云
         Long userUU = accountService.findByPrimaryKey(accountId).getUu();
         Long companyUU = companyService.findByPrimaryKey(BaseContextHolder.getCompanyId()).getUu();

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/mapper/AccountMapper.java

@@ -122,4 +122,12 @@ public interface AccountMapper {
      * @return
      */
     int findByUsernameOrMobileOrEmail(@Param("username") String username, @Param("mobile") String mobile, @Param("email") String email);
+
+    /**
+     * 更新账户公司绑定状态
+     * @param accountId
+     * @param companyId
+     * @param status
+     */
+    void updateBindCompanyStatus(@Param("accountId") Long accountId, @Param("companyId") Long companyId, @Param("status") String status);
 }

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/AccountService.java

@@ -194,4 +194,12 @@ public interface AccountService {
      * @return
      */
     boolean findByUsernameOrMobileOrEmail(String username, String mobile, String email);
+
+    /**
+     * 更新账户公司的绑定状态
+     * @param accountId
+     * @param companyId
+     * @param status
+     */
+    void updateBindCompanyStatus(Long accountId, Long companyId, String status);
 }

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/impl/AccountServiceImpl.java

@@ -209,4 +209,9 @@ public class AccountServiceImpl implements AccountService {
         return accountMapper.findByUsernameOrMobileOrEmail(username, mobile, email) > 0;
     }
 
+    @Override
+    public void updateBindCompanyStatus(Long accountId, Long companyId, String status) {
+        accountMapper.updateBindCompanyStatus(accountId, companyId, status);
+    }
+
 }

base-servers/account/account-server/src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.253.12:3306/saas_account?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://192.168.0.172:3306/saas_account?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:
@@ -36,7 +36,7 @@ spring:
   messages:
     basename: i18n/messages
   redis:
-    host: 192.168.253.12
+    host: 192.168.0.182
     port: 6379
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss

base-servers/account/account-server/src/main/resources/mapper/AccountCompanyMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.usoftchina.saas.account.mapper.AccountCompanyMapper">
     <insert id="insert">
-        insert into ac_account_company(account_id,company_id) values (#{accountId}, #{companyId})
+        insert into ac_account_company(account_id,company_id,status) values (#{accountId}, #{companyId}, 1)
     </insert>
     <delete id="delete">
         delete from ac_account_company where account_id=#{accountId} and company_id=#{companyId}
@@ -18,7 +18,7 @@
         left join ac_account_company accmp on accmp.company_id=cmp.id
         left join ac_account ac on ac.id = accmp.account_id
         left join ac_account aci on aci.id = cmp.creator_id
-        where ac.mobile = #{mobile}
+        where ac.mobile = #{mobile} and accmp.status = 1
         order by is_default desc
     </select>
     <update id="unBindDefault" >

base-servers/account/account-server/src/main/resources/mapper/AccountMapper.xml

@@ -210,4 +210,7 @@
         SELECT COUNT(*) FROM AC_ACCOUNT
         WHERE USERNAME = #{username} OR MOBILE = #{mobile} OR EMAIL = #{email};
     </select>
+    <update id="updateBindCompanyStatus">
+        UPDATE AC_ACCOUNT_COMPANY SET STATUS = #{status} WHERE ACCOUNT_ID = #{accountId} AND COMPANYID = #{companyId}
+    </update>
 </mapper>

base-servers/account/account-server/src/main/resources/mapper/AccountRoleMapper.xml

@@ -17,7 +17,7 @@
         delete from ac_account_role where company_id=#{companyId}
     </delete>
     <select id="selectAccountRole" resultType="com.usoftchina.saas.account.dto.AccountRoleDTO">
-        SELECT a.id id,a.username,a.realname,a.email,a.mobile,GROUP_CONCAT(c.name) roleNames,GROUP_CONCAT(c.id) roleIds,a.enabled
+        SELECT a.id id,a.username,a.realname,a.email,a.mobile,GROUP_CONCAT(c.name) roleNames,GROUP_CONCAT(c.id) roleIds,d.status enabled
         FROM ac_account a
         left join ac_account_company d on a.id = d.account_id
         left join ac_account_role b on a.id=b.account_id and d.company_id = b.company_id
@@ -30,7 +30,7 @@
                 AND d.COMPANY_ID = #{companyId}
             </if>
         </where>
-        group by a.id,a.username,a.realname,a.email,a.mobile,a.enabled
+        group by a.id,a.username,a.realname,a.email,a.mobile,d.status
     </select>
     <delete id="unBindRolesById" >
         DELETE FROM AC_ACCOUNT_ROLE WHERE ACCOUNT_ID = #{id} and company_id = #{companyId}

base-servers/account/account-server/src/main/resources/mapper/RoleMapper.xml

@@ -104,7 +104,7 @@
         select <include refid="baseColumns"/> from ac_role,ac_account_role
         where ac_role.id=ac_account_role.role_id and ac_account_role.account_id=#{accountId,jdbcType=BIGINT}
     </select>
-    <select id="findManagerByCompanyId" parameterType="int" resultType="com.usoftchina.saas.account.po.Role">
+    <select id="findManagerByCompanyId" resultType="com.usoftchina.saas.account.po.Role">
         SELECT * FROM AC_ROLE WHERE COMPANY_ID = #{companyId} AND TYPE = 0 limit 1
     </select>
 </mapper>

base-servers/auth/auth-server/src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.253.12:3306/saas_auth?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://192.168.0.172:3306/saas_auth?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:
@@ -36,7 +36,7 @@ spring:
   messages:
     basename: i18n/messages
   redis:
-    host: 192.168.253.12
+    host: 192.168.0.182
     port: 6379
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss

base-servers/file/file-server/src/main/resources/application.yml

@@ -22,7 +22,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.253.12:3306/saas_file?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://192.168.0.172:3306/saas_file?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:
@@ -34,7 +34,7 @@ spring:
   messages:
     basename: i18n/messages
   redis:
-    host: 192.168.253.12
+    host: 192.168.0.182
     port: 6379
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss

base-servers/gateway-server/src/main/resources/application.yml

@@ -109,7 +109,7 @@ spring:
         predicates:
         - Path=/ws/**
   redis:
-    host: 192.168.253.12
+    host: 192.168.0.182
     port: 6379
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss

base-servers/mail/mail-server/src/main/resources/application.yml

@@ -22,7 +22,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.253.12:3306/saas_mail?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://192.168.0.172:3306/saas_mail?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:
@@ -34,7 +34,7 @@ spring:
   messages:
     basename: i18n/messages
   redis:
-    host: 192.168.253.12
+    host: 192.168.0.182
     port: 6379
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss

base-servers/socket/socket-server/src/main/resources/application.yml

@@ -23,7 +23,7 @@ spring:
     sampler:
       probability: 1.0
   redis:
-    host: 192.168.253.12
+    host: 192.168.0.182
     port: 6379
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss

base-servers/ui-server/src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
       probability: 1.0
   data:
     mongodb:
-      uri: mongodb://192.168.253.12:27017/saas_ui
+      uri: mongodb://192.168.0.183:27017/saas_ui
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

frontend/saas-web/app/view/home/InfoCard.js

@@ -54,25 +54,25 @@ Ext.define('saas.view.home.InfoCard', {
                     title: '待付款',
                     color: 'red',
                     viewType: 'purchase-purchasein-querypanel',
-                    condition: 'pi_class in(\'采购验收单\',\'采购验退单\') and prodinout.companyId=' + companyId + ' and TO_DAYS(pi_date+ifnull(ve_promisedays,0))-TO_DAYS(now()) <= 7 and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=' + companyId + ' and ifnull(sl_namount,0)<>0)'
+                    condition: 'pi_class in (\'采购验收单\',\'采购验退单\') and prodinout.companyId=' + companyId + ' and TO_DAYS(pi_date+ifnull(ve_promisedays,0))-TO_DAYS(now()) <= 7 and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=' + companyId + ' and ifnull(sl_namount,0)<>0)'
                 },
                 unreceive: {
                     title: '待收款',
                     color: 'pink',
                     viewType: 'sale-saleout-querypanel',
-                    condition: 'pi_class in(\'出货单\',\'销售退货单\') and prodinout.companyId=' + companyId + ' and TO_DAYS(pi_date+ifnull(cu_promisedays,0))-TO_DAYS(now()) <= 7 and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=' + companyId + ' and ifnull(sl_namount,0)<>0)'
+                    condition: 'pi_class in (\'出货单\',\'销售退货单\') and prodinout.companyId=' + companyId + ' and TO_DAYS(pi_date+ifnull(cu_promisedays,0))-TO_DAYS(now()) <= 7 and exists (select 1 from subledger where sl_code=pi_inoutno and sl_kind=pi_class and subledger.companyId=' + companyId + ' and ifnull(sl_namount,0)<>0)'
                 },
                 unauditcheck: {
                     title: '未审核验收',
                     color: 'blue',
                     viewType: 'purchase-purchasein-querypanel',
-                    condition: 'pi_statuscode<>\'AUDITED\' and pi_class=\'采购验收单\' and prodinout.companyId=' + companyId
+                    condition: 'pi_statuscode<>\'AUDITED\' and pi_class in (\'采购验收单\',\'采购验退单\') and prodinout.companyId=' + companyId
                 },
                 unauditship: {
                     title: '未审核出货',
                     color: 'default',
                     viewType: 'sale-saleout-querypanel',
-                    condition: 'pi_statuscode<>\'AUDITED\' and pi_class=\'出货单\' and prodinout.companyId=' + companyId
+                    condition: 'pi_statuscode<>\'AUDITED\' and pi_class in (\'出货单\',\'销售退货单\') and prodinout.companyId=' + companyId
                 }
             },
             userCls: 'x-info-card ' + me.userCls,

frontend/saas-web/app/view/sale/sale/QueryPanel.js

@@ -124,7 +124,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             text: '业务状态',
             align: 'center',
             dataIndex: 'sa_sendstatus',
-            width: 90
+            width: 100
         }, {
             text: '业务员',
             dataIndex: 'sa_seller',
@@ -170,6 +170,11 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             text: '客户名称',
             dataIndex: 'sa_custname',
             width: 120
+        },  {
+            text: '业务状态',
+            align: 'center',
+            dataIndex: 'sa_sendstatus',
+            width: 90
         }, {
             text: '明细序号',
             dataIndex: 'sd_detno',