blade-ops/blade-resource/src/main/resources/application.yml
@@ -5,7 +5,7 @@ enabled: true name: minio tenant-mode: true endpoint: https://s16s652780.51mypc.cn endpoint: http://36.134.81.48:9001 access-key: minioadmin secret-key: minioadmin bucket-name: jfpt blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -88,6 +88,18 @@ } /** * 查询所有 * @return */ @GetMapping("/listAll") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入alarm") public R<List> listAll() { List pages = alarmService.list(); return R.data(pages); } /** * 获取最后一个记录 */ @GetMapping("/getLimit") blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -71,7 +71,9 @@ <if test="alarm.endTime!=null and alarm.endTime!=''"> and a.alarmTime<=#{alarm.endTime} </if> ORDER BY a.alarmTime desc ORDER BY a.jtype ASC, a.alarmTime DESC </select> <select id="selectList" resultMap="alarmResultMap"> blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.xml
@@ -26,6 +26,8 @@ <result column="address" property="address"/> <result column="type" property="type"/> <result column="dj" property="dj"/> <result column="jd" property="jd"/> <result column="wd" property="wd"/> <result column="information" property="information"/> <result column="createtime" property="createtime"/> <result column="is_delete" property="isDelete"/> @@ -102,7 +104,7 @@ <select id="selectList" resultMap="suserResultMaps"> select s.id,ynumber,ST_ASTEXT(s.coordinate) as coordinate,s.yname,s.phone,s.address,l.types as type,s.dj,s.information,s.createtime,d.addvnm as addvcd from sys_suser s left join sys_district d on d.addvcds=s.addvcd LEFT JOIN sys_lx l on l.tnumber=s.type where is_delete=0 select s.id,ynumber,s.jd,s.wd,ST_ASTEXT(s.coordinate) as coordinate,s.yname,s.phone,s.address,l.types as type,s.dj,s.information,s.createtime,d.addvnm as addvcd from sys_suser s left join sys_district d on d.addvcds=s.addvcd LEFT JOIN sys_lx l on l.tnumber=s.type where is_delete=0 <if test="type!=null and type!=''"> and s.type =#{type} </if> blade-service/blade-jfpts/src/main/resources/application-dev.yml
@@ -5,6 +5,6 @@ #数据源配置 spring: datasource: url: jdbc:mysql://192.168.0.105:3306/jfpt?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&useOldAliasMetadataBehavior=true url: jdbc:mysql://36.134.81.48:3306/jfpt?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true&useOldAliasMetadataBehavior=true username: root password: 123456 password: jfpt123
