diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsStations.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsStations.java index 898e238d..8966904d 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsStations.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsStations.java @@ -52,6 +52,7 @@ public class GardsStations implements Serializable { @TableField(value = "MODDATE") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date moddate; } diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/modules/controller/AlarmSysUserController.java b/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/modules/controller/AlarmSysUserController.java deleted file mode 100644 index e4c4cc75..00000000 --- a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/modules/controller/AlarmSysUserController.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.jeecg.modules.controller; - -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import org.jeecg.modules.system.entity.*; -import org.jeecg.modules.system.mapper.*; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import static org.apache.commons.collections.CollectionUtils.collect; - -@RestController -@RequestMapping("alarmSysUser") -public class AlarmSysUserController { - - @Resource - private SysUserMapper sysUserMapper; - @Resource - private SysUserRoleMapper sysUserRoleMapper; - @Resource - private SysRoleMapper sysRoleMapper; - @Resource - private SysDictItemMapper sysDictItemMapper; - @Resource - private GardsDetectorsMapper gardsDetectorsMapper; - - - - -}