智慧保安后台管理-外网项目备份
zhongrj
2022-08-24 354ca3e06039fbd59a774b6fa168b283f5f1d392
dev 数据库连接配置修改
8 files modified
42 ■■■■■ changed files
src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java 10 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/equipage/controller/CarController.java 5 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java 3 ●●●● patch | view | raw | blame | history
src/main/resources/application-dev.yml 8 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/accreditation/controller/AccreditationRecordsController.java
@@ -179,7 +179,6 @@
                    ",audit_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(accreditationRecords.getAuditTime()) + "" +
                    ",audit_user = " + accreditationRecords.getAuditUser() + " " +
                    "where id = " + "'" + accreditationRecords.getId() + "'";
            //FtpUtil.sqlFileUpload(s);
            myAsyncService.dataSync(s);
        }
        //返回
@@ -222,7 +221,6 @@
                            "update blade_user set user_type = " + user.getUserType() + "" +
                            ",update_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "" +
                            "where id = " + "'" + user.getId() + "'";
                    //FtpUtil.sqlFileUpload(s);
                    myAsyncService.dataSync(s);
                }else {
                    //内网同步
@@ -232,7 +230,6 @@
                            ",audit_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(accreditationRecords.getAuditTime()) + "" +
                            ",audit_user = " + accreditationRecords.getAuditUser() + " " +
                            "where id = " + "'" + accreditationRecords.getId() + "'";
                    //FtpUtil.sqlFileUpload(s);
                    myAsyncService.dataSync(s);
                }
            }else {
@@ -243,7 +240,6 @@
                        ",audit_time = " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(accreditationRecords.getAuditTime()) + "" +
                        ",audit_user = " + accreditationRecords.getAuditUser() + " " +
                        "where id = " + "'" + accreditationRecords.getId() + "'";
                //FtpUtil.sqlFileUpload(s);
                myAsyncService.dataSync(s);
            }
        });
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -202,7 +202,6 @@
                        "'" + dispatcher.getStatus() + "'" + ");" +
                        "update blade_user set dispatch = " + "'" + user.getDispatch() + "'" +
                        " " + "where id = " + "'" + user.getId() + "'";
                //FtpUtil.sqlFileUpload(s1);
                myAsyncService.dataSync(s1);
            }
        } else {
@@ -333,7 +332,6 @@
                                    "'" + dispatcher.getStatus() + "'" + ");" +
                                    "update blade_user set dispatch = " + "'" + user.getDispatch() + "'" +
                                    " " + "where id = " + "'" + user.getId() + "'";
                            //FtpUtil.sqlFileUpload(s1);
                            myAsyncService.dataSync(s1);
                        }
                    } else {
@@ -385,7 +383,6 @@
                            "'" + dispatcher.getStatus() + "'" + ");" +
                            "update blade_user set dispatch = " + "'" + user.getDispatch() + "'" +
                            " " + "where id = " + "'" + user.getId() + "'";
                    //FtpUtil.sqlFileUpload(s1);
                    myAsyncService.dataSync(s1);
                }
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
@@ -140,7 +140,7 @@
                //数据同步
                String s1 =
                    "insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,jurisdiction,create_time,start_time,end_time," +
                        "serve_type,security_linkman,cell,num) " +
                        "serve_type,security_linkman,cell,num,district) " +
                        "values(" + "'" + dispatcherUnit.getId() + "'" + "," +
                        "'" + dispatcherUnit.getName() + "'" + "," +
                        "'" + dispatcherUnit.getDeptId() + "'" + "," +
@@ -153,15 +153,14 @@
                        "'" + dispatcherUnit.getServeType() + "'" + "," +
                        "'" + dispatcherUnit.getSecurityLinkman() + "'" + "," +
                        "'" + dispatcherUnit.getCell() + "'" + "," +
                        "'" + dispatcherUnit.getNum() + "'" + ")";
                //FtpUtil.sqlFileUpload(s1);
                        "'" + dispatcherUnit.getNum() + "'" + "," +
                        "'" + dispatcherUnit.getDistrict() + "'" + ")";
                myAsyncService.dataSync(s1);
            }
        } else {
            //修改
            status = dispatcherUnitService.updateById(dispatcherUnit);
            //派遣记录修改合同时间
            Long id = dispatcherUnit.getId();
            String ids = String.valueOf(id);
            Date date = dispatcherUnit.getEndTime();
@@ -182,13 +181,12 @@
                        ",security_linkman = " + "'" + dispatcherUnit.getSecurityLinkman() + "'" +
                        ",cell = " + "'" + dispatcherUnit.getCell() + "'" +
                        ",num = " + "'" + dispatcherUnit.getNum() + "'" +
                        ",district = " + "'" + dispatcherUnit.getDistrict() + "'" +
                        " " + "where id = " + "'" + dispatcherUnit.getId() + "'";
                //FtpUtil.sqlFileUpload(s1);
                myAsyncService.dataSync(s1);
                //内网同步派遣记录修改合同时间
                String s2 =
                    "update sys_dispatcher set end_time = " + "'" + endTime + "'" + " " + "where dispatcher_unit_id = " + "'" + ids + "'";
                //FtpUtil.sqlFileUpload(s2);
                myAsyncService.dataSync(s2);
            }
        }
src/main/java/org/springblade/modules/dispatcher/entity/DispatcherUnit.java
@@ -80,7 +80,7 @@
    /**
     * 行政区id
     */
    private Long jurisdiction;
    private String jurisdiction;
    /**
     * 合同生效时间
src/main/java/org/springblade/modules/dispatcher/service/impl/DispatcherUnitServiceImpl.java
@@ -174,7 +174,8 @@
            //数据同步
            String s1 =
                "insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,create_time,start_time,end_time,serve_type,security_linkman,cell,num) " +
                "insert into sys_dispatcher_unit(id,name,dept_id,linkman,phone,create_time,start_time,end_time," +
                    "serve_type,security_linkman,cell,num,district) " +
                    "values(" + "'" + dispatcherUnit.getId() + "'" + "," +
                    "'" + dispatcherUnit.getName() + "'" + "," +
                    "'" + dispatcherUnit.getDeptId() + "'" + "," +
@@ -186,8 +187,8 @@
                    "'" + dispatcherUnit.getServeType() + "'" + "," +
                    "'" + dispatcherUnit.getSecurityLinkman() + "'" + "," +
                    "'" + dispatcherUnit.getCell() + "'" + "," +
                    "'" + dispatcherUnit.getNum() + "'" + ")";
            //FtpUtil.sqlFileUpload(s1);
                    "'" + dispatcherUnit.getNum() + "'" + "," +
                    "'" + dispatcherUnit.getDistrict() + "'" + ")";
            myAsyncService.dataSync(s1);
        });
    }
src/main/java/org/springblade/modules/equipage/controller/CarController.java
@@ -106,7 +106,6 @@
                        "'" + car.getUmweltsatz() + "'" + "," +
                        "'" + car.getMode() + "'" + "," +
                        "'" + car.getJurisdiction() + "'" + ")";
                //FtpUtil.sqlFileUpload(s1);
                myAsyncService.dataSync(s1);
            }
@@ -120,14 +119,13 @@
                        ",number_type = " + "'" + car.getNumberType() + "'" +
                        ",car_type = " + "'" + car.getCarType() + "'" +
                        ",dept_id = " + "'" + car.getDeptId() + "'" +
                        ",person_in_charge = " + "'" + car.getJurisdiction() + "'" +
                        ",person_in_charge = " + "'" + car.getPersonInCharge() + "'" +
                        ",brand = " + "'" + car.getBrand() + "'" +
                        ",date_for_production = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(car.getDateForProduction()) + "'" +
                        ",umweltsatz = " + "'" + car.getUmweltsatz() + "'" +
                        ",mode = " + "'" + car.getMode() + "'" +
                        ",jurisdiction = " + "'" + car.getJurisdiction() + "'" +
                        " " + "where id = " + "'" + car.getId() + "'";
                //FtpUtil.sqlFileUpload(s1);
                myAsyncService.dataSync(s1);
            }
        }
@@ -146,7 +144,6 @@
        list.forEach(id -> {
            //内网同步
            String s1 = "delete from sys_car where id = " + "'" + id + "'";
            //FtpUtil.sqlFileUpload(s1);
            myAsyncService.dataSync(s1);
        });
        return R.status(carService.removeByIds(Func.toLongList(ids)));
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -215,6 +215,7 @@
                    securityPaperService.save(securityPaper);
                    //修改为持证保安
                    user1.setHold("1");
                    user1.setUpdateTime(new Date());
                    //更新保安数据
                    boolean b = userService.updateById(user1);
                    if (b) {
@@ -223,8 +224,8 @@
                            "update blade_user set hold = " + "'" + user1.getHold() + "'" +
                                ",securitynumber = " + "'" + user1.getSecuritynumber() + "'" +
                                ",user_type = " + "'" + user1.getUserType() + "'" +
                                ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user1.getUpdateTime()) + "'" +
                                " " + "where id = " + "'" + user1.getId() + "'";
                        //FtpUtil.sqlFileUpload(s1);
                        myAsyncService.dataSync(s1);
                    }
                }
src/main/resources/application-dev.yml
@@ -24,7 +24,7 @@
  datasource:
    # MySql
    url: jdbc:mysql://localhost:3306/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    url: jdbc:mysql://47.49.36.191:3306/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: NCzhba@2022
@@ -54,7 +54,7 @@
#ftp 设置
ftp:
  sqlConnect: jdbc:mysql://localhost:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
  sqlConnect: jdbc:mysql://47.49.36.191:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
  ftpHost: 117.40.91.118
  ftpPort: 21
  ftpUserName: zhbain
@@ -64,7 +64,7 @@
  ip: http://47.49.36.190:9000
  jsonUrl: /home/zhongsong/anbao/
  username: root
  password: ZHba@0112
  password: NCzhba@2022
#  qfqkBaseApiUrl: http://61.131.136.25:2082/api
  qfqkBaseApiUrl: http://localhost:83
@@ -73,7 +73,7 @@
  sync:
    type: sql
    driver: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://localhost:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    url: jdbc:mysql://47.49.36.191:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
    username: root
    password: NCzhba@2022