fei.wang
2025-03-07 d58e983ad7dec5672e0562f020b3a457614e0983
监测平台后端提交
已修改3个文件
12 ■■■■ 文件已修改
src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/hxzkmonitor/controller/TbUserController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/hxzkmonitor/controller/TbEquipmentController.java
@@ -65,7 +65,7 @@
    }
    @PostMapping("/api/addorupEquipment")
    public R addorupEquipment(TbEquipment tbEquipment) {
    public R addorupEquipment(TbEquipment tbEquipment) throws Exception{
        if (tbEquipmentService.addorupEquipment(tbEquipment) == -1) {
            return R.failed("当前编号已存在");
        } else {
src/main/java/com/hxzkmonitor/controller/TbUserController.java
@@ -89,7 +89,7 @@
        }
        if (tbUser.getId()!=null){
        if (tbUser.getId()==null){
            TbUser phone =  tbUserService.findPhoneUser(tbUser.getAdminphone());
            if (phone==null){
                return R.ok(tbUserService.addorupUser(tbUser));
src/main/resources/application.yml
@@ -48,12 +48,12 @@
  datasource:
    driver-class-name: com.mysql.cj.jdbc.Driver
#    url: jdbc:mysql://192.168.31.112:3306/hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
    url: jdbc:mysql:///hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
    url: jdbc:mysql://192.168.31.98:3306/hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
#    url: jdbc:mysql:///hxzksm?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull
    username: root
#    password: hxzk20151102
#    password: 123456
    password: blueiot
    password: 123456
#    password: blueiot
  jackson:
    date-format: yyyy-MM-dd HH:mm:ss
    time-zone: GMT+8