新增数据同步方式及配置，当选择为sql时则为数据库直连同步，全局替换所有的同步方法，用户修改，离职，注销修改调整，文件上传去除同步推送上传

zhongrj

2022-08-22 3c607f075990d6d3238daa7db1c68eaae8126424

 src/main/java/org/springblade/modules/recordLegalperson/controller/RecordLegalpersonController.java

@@ -28,6 +28,7 @@
import org.springblade.common.enums.DictEnum;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -46,11 +47,13 @@
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;

import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
@@ -73,6 +76,7 @@
   private final IInformationService informationService;
   private final IUserService userService;
   private final IAttachService attachService;
   private final MyAsyncService myAsyncService;

   /**
    * 详情
@@ -138,7 +142,8 @@
         String id = map.get("id").toString();
         recordService.removeByIds(Func.toLongList(id));
         String s1 = "delete from sys_record where id = " + "'" + id + "'";
         FtpUtil.sqlFileUpload(s1);
         //FtpUtil.sqlFileUpload(s1);
         myAsyncService.dataSync(s1);
      }
      record.setStorage("1");
      record.setType("2");
@@ -162,7 +167,8 @@
         "," + "'" + record.getChangecontacts() + "'" +
         "," + "'" + record.getChangecontactscell() + "'" +
         ")";
      FtpUtil.sqlFileUpload(s);
      //FtpUtil.sqlFileUpload(s);
      myAsyncService.dataSync(s);
      return R.success("成功");
   }

@@ -196,251 +202,84 @@
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入record")
   public R update(@Valid @RequestBody RecordLegalperson record) {
      boolean status = false;
      //审核通过
      if (record.getType().equals("0")) {
         //新增组织机构和单位信息
         //查询单位是否存在,先按公司名称查,查不到再按组织机构代码查
         Information information = new Information();
         information.setCreditcode(record.getCreditcode());
         information.setEnterprisename(record.getEnterprisename());
         information.setRepresentative(record.getRepresentative());
         information.setEstablishtime(record.getEstablishtime());
         information.setRegisteredcapital(record.getRegisteredcapital());
         information.setOrganizationcode(record.getOrganizationcode());
         information.setRegistrationnumber(record.getRegistrationnumber());
         information.setEnterprises(record.getEnterprises());
         information.setAddress(record.getAddress());
         information.setBusiness(record.getBusiness());
         information.setRegion(record.getRegion());
         information.setRegistration(record.getRegistration());
         information.setIndustry(record.getIndustry());
         information.setRepresentativecell(record.getRepresentativecell());
         information.setContacts(record.getContacts());
         information.setContactscell(record.getContactscell());
         Dept dept = new Dept();
         //本市公司
         if (record.getPtype().equals("2")) {
            Long i = 1425366663452196865L;
            dept.setParentId(i);
            dept.setAncestors("0,1425366663452196865");
         List<Information> list = informationService.list(Condition.getQueryWrapper(information));
         if (list.size()>0){
            //更新法人信息
            Information information1 = list.get(0);
            information1.setRepresentative(record.getChangecontacts());
            information1.setRepresentativecell(record.getChangecontactscell());
            //修改
            informationService.updateById(information1);
            //变更信息修改
            recordService.updateById(record);
            status = true;
            //数据同步到内网
            String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
                     ",approve = " + "'" + record.getApprove() + "'" +
                     " " + "where id = " + "'" + record.getId() + "';" +
                     "update sys_information set representative = " + "'" + information1.getRepresentative() + "'" +
                     ",representativecell = " + "'" + information1.getRepresentativecell()  + "'" +
                     " " + "where id = " + "'" + information1.getId() + "'";
            //FtpUtil.sqlFileUpload(s1);
            myAsyncService.dataSync(s1);
         }else {
            //按组织机构查询
            Information information2 = new Information();
            information2.setCreditcode(record.getCreditcode());
            List<Information> list1 = informationService.list(Condition.getQueryWrapper(information2));
            if (list1.size()>0){
               //更新法人信息
               Information information1 = list.get(0);
               information1.setRepresentative(record.getChangecontacts());
               information1.setRepresentativecell(record.getChangecontactscell());
               //修改
               informationService.updateById(information1);
               //变更信息修改
               recordService.updateById(record);
               status = true;
               //数据同步到内网
               String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
                  ",approve = " + "'" + record.getApprove() + "'" +
                  " " + "where id = " + "'" + record.getId() + "';" +
                  "update sys_information set representative = " + "'" + information1.getRepresentative() + "'" +
                  ",representativecell = " + "'" + information1.getRepresentativecell()  + "'" +
                  " " + "where id = " + "'" + information1.getId() + "'";
               //FtpUtil.sqlFileUpload(s1);
               myAsyncService.dataSync(s1);
            }else {
               //设置未审核不通过
               record.setType("1");
               record.setApprove("当前公司单位未保安服务系统存在,请先注册!");
               recordService.updateById(record);
               //数据同步到内网
               String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
                  ",approve = " + "'" + record.getApprove() + "'" +
                  " " + "where id = " + "'" + record.getId() + "'";
               //FtpUtil.sqlFileUpload(s1);
               myAsyncService.dataSync(s1);
               throw new ServiceException("当前公司单位未保安服务系统存在,请先注册!");
            }
         }
         //培训公司
         else {
            Long i = 1420222768149966850L;
            dept.setParentId(i);
            dept.setAncestors("0,1420222768149966850");
         }
         dept.setTenantId("000000");
         dept.setDeptName(information.getEnterprisename());
         dept.setDeptCategory(1);
         if (iDeptService.submit(dept)) {
            CacheUtil.clear(SYS_CACHE);
            // 返回懒加载树更新节点所需字段
            Kv kv = Kv.create().set("id", String.valueOf(dept.getId())).set("tenantId", dept.getTenantId())
               .set("deptCategoryName", DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory()));
            String id = kv.get("id").toString();
            information.setDepartmentid(id);
         }
         informationService.save(information);
         Integer isDeleted = 0;
         //注册用户
         User user = new User();
         user.setDeptId(information.getDepartmentid());
         user.setTenantId("000000");
         user.setAccount(record.getEnterprisename());
         String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
         user.setPassword(DigestUtil.encrypt(initPassword));
         //user.setPassword(initPassword);
         user.setCreateTime(new Date());
         user.setUpdateTime(new Date());
         user.setRoleId("1414575196264300546");
         user.setStatus(1);
         user.setIsDeleted(0);
         userService.save(user);
         String roleid = "1415563428727328770";
         String s = "insert into sys_information(id,creditCode,enterpriseName,representative" +
            ",registeredCapital,organizationCode,registrationNumber, enterprises, address," +
            " business,region,registration,industry,departmentid,stats,jurisdiction,representativecell," +
            "contacts,contactscell,create_user_id) " +
            "values(" + "'" + information.getId() + "'" +
            "," + "'" + information.getCreditcode() + "'" +
            "," + "'" + information.getEnterprisename() + "'" +
            "," + "'" + information.getRepresentative() + "'" +
            "," + "'" + information.getRegisteredcapital() + "'" +
            "," + "'" + information.getOrganizationcode() + "'" +
            "," + "'" + information.getRegistrationnumber() + "'" +
            "," + "'" + information.getEnterprises() + "'" +
            "," + "'" + information.getAddress() + "'" +
            "," + "'" + information.getBusiness() + "'" +
            "," + "'" + information.getRegion() + "'" +
            "," + "'" + information.getRegistration() + "'" +
            "," + "'" + information.getIndustry() + "'" +
            "," + "'" + information.getDepartmentid() + "'" +
            "," + "'" + information.getStats() + "'" +
            "," + "'" + information.getJurisdiction() + "'" +
            "," + "'" + information.getRepresentativecell() + "'" +
            "," + "'" + information.getContacts() + "'" +
            "," + "'" + information.getContactscell() + "'" +
            "," + "'" + information.getCreateUserId() + "'" + ")";
         FtpUtil.sqlFileUpload(s);
         String ss = "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,is_deleted) values(" + "'" + dept.getId() + "'" + "," + "'" + dept.getParentId() + "'" + ","
            + "'" + dept.getTenantId() + "'" +
            "," + "'" + information.getEnterprisename() + "'" +
            "," + "'" + dept.getAncestors() + "'" +
            "," + "'" + dept.getDeptCategory() + "'" +
            "," + "'" + isDeleted + "'" + ")";
         FtpUtil.sqlFileUpload(ss);
         String rtime;
         String paperTime;
         if (user.getRtime() == null) {
            rtime = null;
         } else {
            rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
         }
         //发证日期处理
         if (user.getPaperTime() == null) {
            paperTime = "";
         } else {
            paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
         }
         //头像
         if (null != user.getAvatar() && !user.getAvatar().equals("")) {
            user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
         }

         //指纹
         if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
            user.setFingerprint(FtpConfig.ip + user.getFingerprint().substring(26));
         }

         String sss = "insert into blade_user(" +
            "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
            "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
            "politicaloutlook,healstats,height,address,registered,rtime," +
            "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
            "values(" + "'" + user.getId() + "'" +
            "," + "'" + user.getTenantId() + "'" +
            "," + "'" + user.getAccount() + "'" +
            "," + "'" + user.getPassword() + "'" +
            "," + "'" + user.getName() + "'" +
            "," + "'" + user.getRealName() + "'" +
            "," + "'" + user.getAvatar() + "'" +
            "," + "'" + user.getEmail() + "'" +
            "," + "'" + user.getPhone() + "'" +
            "," + "'" + null + "'" +
            "," + "'" + roleid + "'" +
            "," + "'" + user.getDeptId() + "'" +
            "," + "'" + user.getCardid() + "'" +
            "," + "'" + user.getNativeplace() + "'" +
            "," + "'" + user.getNation() + "'" +
            "," + "'" + user.getFingerprint() + "'" +
            "," + "'" + user.getEducation() + "'" +
            "," + "'" + user.getPoliticaloutlook() + "'" +
            "," + "'" + user.getHealstats() + "'" +
            "," + "'" + user.getHeight() + "'" +
            "," + "'" + user.getAddress() + "'" +
            "," + "'" + user.getRegistered() + "'" +
            "," + "'" + rtime + "'" +
            "," + "'" + user.getSecuritynumber() + "'" +
            "," + "'" + user.getHold() + "'" +
            "," + "'" + user.getJurisdiction() + "'" +
            "," + "'" + user.getExaminationType() + "'" +
            "," + "'" + user.getStatus() + "'" +
            "," + "'" + user.getIsDeleted() + "'" +
            "," + "'" + user.getDispatch() + "'" + ")";
         FtpUtil.sqlFileUpload(sss);
//         Integer isDeleted = 0;
//         //注册用户
//         User user = new User();
//         user.setDeptId(information.getDepartmentid());
//         user.setTenantId("000000");
//         user.setAccount(record.getEnterprisename());
//         String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
//         user.setPassword(initPassword);
//         user.setCreateTime(new Date());
//         user.setUpdateTime(new Date());
//         user.setRoleId("1414575196264300546");
//         user.setStatus(1);
//         user.setIsDeleted(0);
//         userService.save(user);
//         String roleid = "1415563428727328770";
//         String s = "insert into sys_information(id,creditCode,enterpriseName,representative" +
//            ",registeredCapital,organizationCode,registrationNumber, enterprises, address," +
//            " business,region,registration,industry,departmentid,stats,jurisdiction,representativecell," +
//            "contacts,contactscell,create_time,create_user_id) " +
//            "values(" + "'" + information.getId() + "'" +
//            "," + "'" + information.getCreditcode() + "'" +
//            "," + "'" + information.getEnterprisename() + "'" +
//            "," + "'" + information.getRepresentative() + "'" +
//            "," + "'" + information.getRegisteredcapital() + "'" +
//            "," + "'" + information.getOrganizationcode() + "'" +
//            "," + "'" + information.getRegistrationnumber() + "'" +
//            "," + "'" + information.getEnterprises() + "'" +
//            "," + "'" + information.getAddress() + "'" +
//            "," + "'" + information.getBusiness() + "'" +
//            "," + "'" + information.getRegion() + "'" +
//            "," + "'" + information.getRegistration() + "'" +
//            "," + "'" + information.getIndustry() + "'" +
//            "," + "'" + information.getDepartmentid() + "'" +
//            "," + "'" + information.getStats() + "'" +
//            "," + "'" + information.getJurisdiction() + "'" +
//            "," + "'" + information.getRepresentativecell() + "'" +
//            "," + "'" + information.getContacts() + "'" +
//            "," + "'" + information.getContactscell() + "'" +
//            "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(information.getCreateTime()) + "'" +
//            "," + "'" + information.getCreateUserId() + "'" + ");" +
//            "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,is_deleted) values(" + "'" + information.getDepartmentid() + "'" + "," + "'" + dept.getParentId() + "'" + ","
//            + "'" + dept.getTenantId() + "'" +
//            "," + "'" + information.getEnterprisename() + "'" +
//            "," + "'" + dept.getAncestors() + "'" +
//            "," + "'" + dept.getDeptCategory() + "'" +
//            "," + "'" + isDeleted + "'" + ");" +
//            "insert into blade_user(id,tenant_id,account,password,role_id,dept_id,create_time,update_time,status,is_deleted) " +
//            "values(" + "'" + user.getId() + "'" +
//            "," + "'" + user.getTenantId() + "'"
//            + "," + "'" + user.getAccount() + "'" +
//            "," + "'" + user.getPassword() + "'" +
//            "," + "'" + roleid + "'" +
//            "," + "'" + user.getDeptId() + "'" +
//            "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
//            "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
//            "," + "'" + user.getStatus() + "'" +
//            "," + "'" + user.getIsDeleted() + "'" + ")";
//         FtpUtil.sqlFileUpload(s);
//         //注册用户
//         User user = new User();
//         user.setAccount(record.getEnterprisename());
//         String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
//         user.setPassword(initPassword);
//         boolean b = userService.saveOrUpdate(user);
         //把附件添加单位id
         attachService.updat(information.getDepartmentid(), record.getCardid());
         String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
            ",papprove = " + "'" + record.getPapprove() + "'" +
            ",xapprove = " + "'" + record.getXapprove() + "'" +
            ",sapprove = " + "'" + record.getSapprove() + "'" +
            ",popinion = " + "'" + record.getPopinion() + "'" +
            ",sopinion = " + "'" + record.getSopinion() + "'" +
            ",xopinion = " + "'" + record.getXopinion() + "'" +
            ",ptime = " + "'" + record.getPtime() + "'" +
            ",stime = " + "'" + record.getStime() + "'" +
            ",xtime = " + "'" + record.getXtime() + "'" +
            " " + "where id = " + "'" + record.getId() + "'";
         FtpUtil.sqlFileUpload(s1);
//         attachService.updat(information.getDepartmentid(), record.getCardid());
      } else {
         //更新
         recordService.updateById(record);
         //数据同步
         String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
            ",papprove = " + "'" + record.getPapprove() + "'" +
            ",xapprove = " + "'" + record.getXapprove() + "'" +
            ",sapprove = " + "'" + record.getSapprove() + "'" +
            ",popinion = " + "'" + record.getPopinion() + "'" +
            ",sopinion = " + "'" + record.getSopinion() + "'" +
            ",xopinion = " + "'" + record.getXopinion() + "'" +
            ",ptime = " + "'" + record.getPtime() + "'" +
            ",stime = " + "'" + record.getStime() + "'" +
            ",xtime = " + "'" + record.getXtime() + "'" +
            ",approve = " + "'" + record.getApprove() + "'" +
            " " + "where id = " + "'" + record.getId() + "'";
         FtpUtil.sqlFileUpload(s1);
         //FtpUtil.sqlFileUpload(s1);
         myAsyncService.dataSync(s1);
      }
      return R.status(recordService.saveOrUpdate(record));
      //返回数据
      return R.status(status);
   }

   /**