Skip to content

H
hzsomms
Commit 063d0581 authored by hkl's avatar hkl
Browse files
Options

feat:1.修改bug

parent 8aacdef2
Hide whitespace changes
Inline Side-by-side
Showing with 563 additions and 152 deletions
jeecg-boot-base-core/pom.xml
View file @ 063d0581
......@@ -130,27 +130,6 @@
<version>${mysql-connector-java.version}</version>
<scope>runtime</scope>
</dependency>
<!-- sqlserver-->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>sqljdbc4</artifactId>
<version>${sqljdbc4.version}</version>
<scope>runtime</scope>
</dependency>
<!-- oracle驱动 -->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>${ojdbc6.version}</version>
<scope>runtime</scope>
</dependency>
<!-- postgresql驱动 -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
<scope>runtime</scope>
</dependency>
<!-- Quartz定时任务 -->
<dependency>
......
jeecg-module-system/pom.xml
View file @ 063d0581
......@@ -9,6 +9,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<current.version>0.0.1</current.version>
</properties>
<artifactId>jeecg-module-system</artifactId>
<dependencies>
......@@ -40,13 +44,6 @@
<groupId>org.jeecgframework</groupId>
<artifactId>jeewx-api</artifactId>
</dependency>
<!-- 积木报表 -->
<!--
<dependency>
<groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-spring-boot-starter</artifactId>
</dependency>
-->
<!-- hutool -->
<dependency>
<groupId>cn.hutool</groupId>
......@@ -67,7 +64,56 @@
</dependency>-->
</dependencies>
<profiles>
<!-- 开发环境-->
<profile>
<id>dev</id>
<properties>
<package.environment>dev</package.environment>
</properties>
</profile>
<!-- 黄康林本地配置-->
<profile>
<id>hkl</id>
<properties>
<package.environment>hkl</package.environment>
</properties>
<!-- 是否默认 true表示默认-->
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<!-- 测试环境-->
<profile>
<id>test</id>
<properties>
<package.environment>test</package.environment>
</properties>
</profile>
<!-- 压测环境-->
<profile>
<id>pressure</id>
<properties>
<package.environment>pressure</package.environment>
</properties>
</profile>
<!-- 生成环境环境-->
<profile>
<id>prod</id>
<properties>
<package.environment>prod</package.environment>
</properties>
</profile>
</profiles>
<build>
<finalName>subwayOA-PC-${package.environment}-${current.version}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/controller/RecordPatrolMasterAssistController.java deleted 100644 → 0
View file @ 8aacdef2
package org.jeecg.modules.checkData.controller;
import org.jeecg.modules.checkData.entity.RecordPatrolMasterAssist;
import org.jeecg.modules.checkData.service.IRecordPatrolMasterAssistService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.jeecg.common.system.base.controller.JeecgController;
/**
* <p>
* 线路巡查记录-协助情况表-巡道员使用 前端控制器
* </p>
*
* @author hkl
* @since 2023-07-08
*/
@RestController
@RequestMapping("/patrol/masterAssist")
public class RecordPatrolMasterAssistController extends JeecgController<RecordPatrolMasterAssist, IRecordPatrolMasterAssistService> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/controller/RecordPatrolMasterController.java
View file @ 063d0581
......@@ -48,6 +48,7 @@ public class RecordPatrolMasterController extends JeecgController<RecordPatrolMa
@Autowired
private IRecordPatrolMasterAssistService recordPatrolMasterAssistService;
/**
* 线路巡查记录-分页列表查询
*
......@@ -80,14 +81,15 @@ public class RecordPatrolMasterController extends JeecgController<RecordPatrolMa
List<RecordPatrolMasterInfo> listResult = recordPatrolMasterInfoService.lambdaQuery()
.eq(ObjectUtil.isNotEmpty(id), RecordPatrolMasterInfo::getRecordMasterId, id)
.eq(RecordPatrolMasterInfo::getDelFlag, "0")
.orderByAsc(RecordPatrolMasterInfo::getCreateTime)
.orderByAsc(RecordPatrolMasterInfo::getSeq)
.list();
//初始化最终返回的集合
List<RecordPatrolMasterInfoOneVO> resultList = new ArrayList<>();
if (listResult != null && listResult.size() > 0) {
//获取去重后的项目名称的集合
Set<String> progectNameList = listResult.stream().map(RecordPatrolMasterInfo::getEkProjectName).collect(Collectors.toSet());
for(String name: progectNameList){
for (String name : progectNameList) {
//初始化最终返回的对象
RecordPatrolMasterInfoOneVO resultModel = new RecordPatrolMasterInfoOneVO();
//初始化检查项目对应的详情记录的集合
......@@ -95,10 +97,10 @@ public class RecordPatrolMasterController extends JeecgController<RecordPatrolMa
//循环符合条件的数据项集合
for (RecordPatrolMasterInfo entity : listResult) {
//判断项目名称一样
if(name.equals(entity.getEkProjectName())){
if (name.equals(entity.getEkProjectName())) {
//初始化检查项目对应的详情记录的对象
RecordPatrolMasterInfoVO infoVo = new RecordPatrolMasterInfoVO();
BeanCopyUtil.copyProperties(entity,infoVo);
BeanCopyUtil.copyProperties(entity, infoVo);
infoList.add(infoVo);
}
}
......@@ -109,8 +111,10 @@ public class RecordPatrolMasterController extends JeecgController<RecordPatrolMa
}
return Result.OK(resultList);
}
/**
* 根据线路巡查记录id查询协助详情
* 根据线路巡查记录id查询协助详情
*
* @param id 线路巡查记录id
* @return
*/
......@@ -124,14 +128,15 @@ public class RecordPatrolMasterController extends JeecgController<RecordPatrolMa
.orderByAsc(RecordPatrolMasterAssist::getCreateTime)
.list();
List<RecordPatrolMasterAssistVO> resultList = new ArrayList<>();
if(listResult!=null){
resultList = BeanCopyUtil.copyListProperties(listResult, RecordPatrolMasterAssistVO::new);
if (listResult != null) {
resultList = BeanCopyUtil.copyListProperties(listResult, RecordPatrolMasterAssistVO::new);
}
return Result.OK(resultList);
}
/**
* 线路巡查记录导出excel
*
* @param request
* @param recordPatrolMaster 线路巡查记录
* @return
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/controller/RecordPatrolMasterInfoController.java deleted 100644 → 0
View file @ 8aacdef2
package org.jeecg.modules.checkData.controller;
import org.jeecg.modules.checkData.entity.RecordPatrolMasterInfo;
import org.jeecg.modules.checkData.service.IRecordPatrolMasterInfoService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.jeecg.common.system.base.controller.JeecgController;
/**
* <p>
* 线路巡查记录详情表-巡道员使用 前端控制器
* </p>
*
* @author hkl
* @since 2023-07-08
*/
@RestController
@RequestMapping("/patrol/masterInfo")
public class RecordPatrolMasterInfoController extends JeecgController<RecordPatrolMasterInfo, IRecordPatrolMasterInfoService> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/controller/TrackBedManagementCheckController.java deleted 100644 → 0
View file @ 8aacdef2
package org.jeecg.modules.checkData.controller;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.checkData.entity.TrackBedManagementCheck;
import org.jeecg.modules.checkData.service.ITrackBedManagementCheckService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 设备检查记录数据-道床使用情况记录数据 前端控制器
* </p>
*
* @author hkl
* @since 2023-07-07
*/
@RestController
@RequestMapping("/recordsMaster/trackBedManagementCheck")
public class TrackBedManagementCheckController extends JeecgController<TrackBedManagementCheck, ITrackBedManagementCheckService> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/controller/TurnoutUseCheckController.java deleted 100644 → 0
View file @ 8aacdef2
package org.jeecg.modules.checkData.controller;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.checkData.entity.TurnoutUseCheck;
import org.jeecg.modules.checkData.service.ITurnoutUseCheckService;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 检查数据-设备检查记录数据-设备检查记录数据 前端控制器
* </p>
*
* @author hkl
* @since 2023-07-07
*/
@RestController
@RequestMapping("/checkData/equipmentCheckData/turnoutUseCheck")
public class TurnoutUseCheckController extends JeecgController<TurnoutUseCheck, ITurnoutUseCheckService> {
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/entity/RailWearRecord.java
View file @ 063d0581
......@@ -72,6 +72,10 @@ public class RailWearRecord implements Serializable {
@TableField("left_femoral_apparatus")
private String leftFemoralApparatus;
@ApiModelProperty("左股轨向")
@TableField("left_track_direction")
private String leftTrackDirection;
@ApiModelProperty("右股仪器编码")
@TableField("right_femoral_apparatus_code")
private String rightFemoralApparatusCode;
......@@ -80,6 +84,10 @@ public class RailWearRecord implements Serializable {
@TableField("right_femoral_apparatus")
private String rightFemoralApparatus;
@ApiModelProperty("右股轨向")
@TableField("right_track_direction")
private String rightTrackDirection;
@ApiModelProperty("是否删除（0：未删除，1：已删除）")
@TableField("del_flag")
private String delFlag;
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/entity/RecordPatrolMasterInfo.java
View file @ 063d0581
......@@ -77,6 +77,10 @@ public class RecordPatrolMasterInfo implements Serializable {
@TableField("status")
private String status;
@ApiModelProperty("排序")
@TableField("seq")
private Integer seq;
@ApiModelProperty("是否删除（0：未删除；1：已删除）")
@TableField("del_flag")
private String delFlag;
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/entity/TrackBedManagementCheck.java
View file @ 063d0581
......@@ -70,8 +70,12 @@ public class TrackBedManagementCheck implements Serializable {
private String ekProjectContent;
@ApiModelProperty("检查合格评判标准")
@TableField("ek_peoject_template")
private String ekPeojectTemplate;
@TableField("ek_project_template")
private String ekProjectTemplate;
@ApiModelProperty("现场检查项目状态翻译")
@TableField("ek_project_status_str")
private String ekProjectStatusStr;
@ApiModelProperty("现场检查项目状态（1：合格；2：良好；3：不合格）")
@TableField("ek_project_status")
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/mapper/xml/CurveWearRecordMapper.xml
View file @ 063d0581
......@@ -25,8 +25,8 @@
t2.remark
FROM
t_ek_curve_wear_record t1
LEFT JOIN t_ek_records_master_check t2 ON t1.records_master_check_id = t2.id
left join t_sn_light_rail t3 on t2.light_rail_id = t3.id
LEFT JOIN t_ek_records_master_check t2 ON t1.records_master_check_id = t2.id
LEFT JOIN t_sn_light_rail t3 on t2.light_rail_id = t3.id
WHERE t1.del_flag = '0'
<if test="dto.ekCode != null and dto.ekCode != ''">
AND t2.ek_code like concat('%',#{dto.ekCode},'%')
......@@ -35,7 +35,7 @@
AND t2.check_time >= #{dto.startTime}
</if>
<if test="dto.endTime != null">
AND t2.check_time <![CDATA[ <= ]]> #{dto.endTime}
AND t2.check_time <![CDATA[ <= ]]> DATE_ADD(#{dto.endTime},INTERVAL 1 DAY)
</if>
AND t3.status = 1
GROUP BY t1.curve_code
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/mapper/xml/MovementRecordsMasterMapper.xml
View file @ 063d0581
......@@ -49,6 +49,10 @@
<select id="getTodoList" resultType="org.jeecg.modules.homePage.vo.ToDoDetailVO">
SELECT
t1.id,
t1.light_rail_id ,
t1.light_rail_name ,
t1.line_alias_id ,
t1.line_alias_name ,
t1.ek_code batchCode,
t1.check_time,
'1' toDoType,
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/mapper/xml/RailWearRecordMapper.xml
View file @ 063d0581
......@@ -33,7 +33,7 @@
AND t2.check_time >= #{dto.startTime}
</if>
<if test="dto.endTime != null">
AND t2.check_time <![CDATA[ <= ]]> #{dto.endTime}
AND t2.check_time <![CDATA[ <= ]]> DATE_ADD(#{dto.endTime},INTERVAL 1 DAY)
</if>
</select>
<select id="getDetail"
......@@ -43,7 +43,9 @@
t1.left_femoral_apparatus_code,
t1.left_femoral_apparatus,
t1.right_femoral_apparatus_code,
t1.right_femoral_apparatus
t1.right_femoral_apparatus,
t1.left_track_direction,
t1.right_track_direction
FROM
t_ek_rail_wear_record t1
where t1.id = #{id}
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/mapper/xml/RecordsMasterCheckMapper.xml
View file @ 063d0581
......@@ -30,7 +30,7 @@
AND t1.check_time >= #{dto.startTime}
</if>
<if test="dto.endTime != null">
AND t1.check_time <![CDATA[ <= ]]> #{dto.endTime}
AND t1.check_time <![CDATA[ <= ]]> DATE_ADD(#{dto.endTime},INTERVAL 1 DAY)
</if>
AND t1.type = #{dto.type}
order by t1.create_time desc
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/vo/CurveWearRecordVO.java
View file @ 063d0581
......@@ -88,9 +88,9 @@ public class CurveWearRecordVO {
@ApiModelProperty("道岔数量")
private Integer curveNum;
@ApiModelProperty("道岔code")
private Integer curveCode;
private String curveCode;
@ApiModelProperty("备注")
private String remark;
......
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/vo/RailWearRecordDetailVO.java
View file @ 063d0581
package org.jeecg.modules.checkData.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -34,4 +35,12 @@ public class RailWearRecordDetailVO {
@ApiModelProperty("右股仪器")
private String rightFemoralApparatus;
@ApiModelProperty("左股轨向")
@TableField("left_track_direction")
private String leftTrackDirection;
@ApiModelProperty("右股轨向")
@TableField("right_track_direction")
private String rightTrackDirection;
}
jeecg-module-system/src/main/java/org/jeecg/modules/checkData/vo/TrackBedManagementCheckVO.java
View file @ 063d0581
......@@ -54,15 +54,16 @@ public class TrackBedManagementCheckVO {
private String ekProjectContent;
@ApiModelProperty("检查合格评判标准")
private String ekPeojectTemplate;
private String ekProjectTemplate;
@ApiModelProperty("现场检查项目状态（1：合格；2：良好；3：不合格）")
private String ekProjectStatus;
@ApiModelProperty("现场检查项目状态翻译（1：合格；2：良好；3：不合格）")
private String ekProjectStatusStr;
public String getEkProjectStatusStr() {
return DicMap.EK_APPROVAL_STATUS_MAP.get(ekProjectStatus);
return DicMap.EK_APPROVAL_STATUS_MAP.get(ekProjectStatus);
}
@ApiModelProperty("是否删除（0：未删除，1：已删除）")
......
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/mapper/xml/AnalysisBatchMapper.xml
View file @ 063d0581
......@@ -103,6 +103,10 @@
<select id="getTodoList" resultType="org.jeecg.modules.homePage.vo.ToDoDetailVO">
SELECT
t3.id,
t3.light_rail_id ,
t3.light_rail_name ,
t3.line_alias_id ,
t3.line_alias_name ,
t3.analysis_type,
t3.analysis_batch_code batch_code,
'2' toDoType
......
jeecg-module-system/src/main/java/org/jeecg/modules/homePage/controller/HomePageController.java
View file @ 063d0581
......@@ -4,14 +4,15 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.modules.homePage.dto.DiseaseDTO;
import org.jeecg.modules.homePage.face.HomePageFace;
import org.jeecg.modules.homePage.vo.DiseaseVO;
import org.jeecg.modules.homePage.vo.ToDoVO;
import org.jeecg.modules.subwayNetwork.vo.SectionStationNode;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
/**
......@@ -38,17 +39,24 @@ public class HomePageController {
}
@AutoLog(value = "首页-代办列表")
@ApiOperation(value = "首页-代办列表", notes = "首页-代办列表")
@GetMapping(value = "/todoList")
public Result<ToDoVO> todoList() {
ToDoVO x = homePageFace.todoList();
return Result.OK(x);
ToDoVO vo = homePageFace.todoList();
return Result.OK(vo);
}
@AutoLog(value = "首页-病害列表")
@ApiOperation(value = "首页-病害列表", notes = "首页-病害列表")
@PostMapping(value = "/diseaseList")
public Result<List<DiseaseVO>> diseaseList(@RequestBody DiseaseDTO dto) {
List<DiseaseVO> voList = homePageFace.diseaseList(dto);
return Result.OK(voList);
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/homePage/dto/DiseaseDTO.java 0 → 100644
View file @ 063d0581
package org.jeecg.modules.homePage.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
@ApiModel(value = "DiseaseDTO对象", description = "首页-病害DTO")
public class DiseaseDTO {
@ApiModelProperty("超限类型")
private List<String> overType;
@ApiModelProperty("轨检车超限")
private List<String> overCard;
@ApiModelProperty("水加")
private List<String> h;
@ApiModelProperty("垂加")
private List<String> v;
}
jeecg-module-system/src/main/java/org/jeecg/modules/homePage/face/HomePageFace.java
View file @ 063d0581
package org.jeecg.modules.homePage.face;
import org.jeecg.modules.homePage.dto.DiseaseDTO;
import org.jeecg.modules.homePage.vo.DiseaseVO;
import org.jeecg.modules.homePage.vo.ToDoVO;
import org.jeecg.modules.subwayNetwork.vo.SectionStationNode;
......@@ -20,4 +22,6 @@ public interface HomePageFace {
* @return
*/
ToDoVO todoList();
List<DiseaseVO> diseaseList(DiseaseDTO dto);
}
jeecg-module-system/src/main/java/org/jeecg/modules/homePage/face/impl/HomePageFaceImpl.java
View file @ 063d0581
......@@ -2,7 +2,9 @@ package org.jeecg.modules.homePage.face.impl;
import org.jeecg.modules.checkData.service.IMovementRecordsMasterService;
import org.jeecg.modules.dynamicStaticAnalysis.service.IAnalysisBatchService;
import org.jeecg.modules.homePage.dto.DiseaseDTO;
import org.jeecg.modules.homePage.face.HomePageFace;
import org.jeecg.modules.homePage.vo.DiseaseVO;
import org.jeecg.modules.homePage.vo.ToDoDetailVO;
import org.jeecg.modules.homePage.vo.ToDoVO;
import org.jeecg.modules.maintenanceWork.service.IWorkBatchService;
......@@ -11,6 +13,7 @@ import org.jeecg.modules.subwayNetwork.vo.SectionStationNode;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@Service
......@@ -56,4 +59,34 @@ public class HomePageFaceImpl implements HomePageFace {
vo.setWorkBatchList(workBatchList);
return vo;
}
@Override
public List<DiseaseVO> diseaseList(DiseaseDTO dto) {
List<DiseaseVO> records = new ArrayList<>();
DiseaseVO vo = new DiseaseVO();
vo.setId("1682308697792339970");
vo.setLineAliasCode("SDK");
vo.setMileage("21556");
vo.setOverrunType("左轨向");
vo.setOverrunLevel("1");
vo.setLongitude("2");
vo.setPeakValue("-10.44");
vo.setDataDifference("-0.44");
records.add(vo);
DiseaseVO vo2 = new DiseaseVO();
vo2.setId("1682308697792339970");
vo2.setLineAliasCode("SDK");
vo2.setMileage("21556");
vo2.setOverrunType("左轨向");
vo2.setOverrunLevel("1");
vo2.setLongitude("2");
vo2.setPeakValue("-10.44");
vo2.setDataDifference("-0.44");
records.add(vo2);
return records;
}
}
jeecg-module-system/src/main/java/org/jeecg/modules/homePage/vo/DiseaseVO.java 0 → 100644
View file @ 063d0581
package org.jeecg.modules.homePage.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "DiseaseVO对象", description = "首页-病害vo列表")
public class DiseaseVO {
@ApiModelProperty("id")
private String id;
@ApiModelProperty("冠名")
private String lineAliasCode;
@ApiModelProperty("里程")
private String mileage;
@ApiModelProperty("超限类型")
private String overrunType;
@ApiModelProperty("超限等级")
private String overrunLevel;
@ApiModelProperty("线别id")
private String lineAliasId;
@ApiModelProperty("长度")
private String longitude;
@ApiModelProperty("峰值")
private String peakValue;
@ApiModelProperty("管理数据差")
private String dataDifference;
@ApiModelProperty("病害类型")
private String diseaseType;
@ApiModelProperty("病害类型名称")
private String diseaseTypeName;
}
jeecg-module-system/src/main/java/org/jeecg/modules/homePage/vo/ToDoDetailVO.java
View file @ 063d0581
package org.jeecg.modules.homePage.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -12,6 +11,18 @@ public class ToDoDetailVO {
@ApiModelProperty("id")
private String id;
@ApiModelProperty("所属线路id")
private String lightRailId;
@ApiModelProperty("所属线路名称")
private String lightRailName;
@ApiModelProperty("所属线别id")
private String lineAliasId;
@ApiModelProperty("所属线别名称")
private String lineAliasName;
@ApiModelProperty("批次号")
private String batchCode;
......
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchMapper.xml
View file @ 063d0581
......@@ -28,7 +28,7 @@
WHERE
t1.del_flag = '0'
<if test="dto.workBatchCode != null and dto.workBatchCode != ''">
AND t2.work_batch_code like concat('%',#{dto.workBatchCode},'%')
AND t1.work_batch_code like concat('%',#{dto.workBatchCode},'%')
</if>
</select>
......@@ -137,9 +137,14 @@
LEFT JOIN t_mw_work_batch t2 ON t1.work_batch_id = t2.id AND t2.del_flag = '0'
ORDER BY t2.create_time
</select>
<select id="getTodoList" resultType="org.jeecg.modules.homePage.vo.ToDoDetailVO">
SELECT
t1.id,
t1.light_rail_id ,
t1.light_rail_name ,
t1.line_alias_id ,
t1.line_alias_name ,
t1.work_batch_code batch_code,
'3' toDoType,
t1.source workType
......
jeecg-module-system/src/main/resources/application-pressure.yml 0 → 100644
View file @ 063d0581
server:
port: 17000
tomcat:
max-swallow-size: -1
error:
include-exception: true
include-stacktrace: ALWAYS
include-message: ALWAYS
servlet:
context-path: /hzsomms/api
compression:
enabled: true
min-response-size: 1024
mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
management:
endpoints:
web:
exposure:
include: metrics,httptrace
spring:
servlet:
multipart:
max-file-size: 10MB
max-request-size: 10MB
mail:
host: smtp.163.com
username: ??
password: ??
properties:
mail:
smtp:
auth: true
starttls:
enable: true
required: true
## quartz定时任务,采用数据库方式
quartz:
job-store-type: jdbc
initialize-schema: embedded
#定时任务启动开关，true-开 false-关
auto-startup: true
#延迟1秒启动定时任务
startup-delay: 1s
#启动时更新己存在的Job
overwrite-existing-jobs: true
properties:
org:
quartz:
scheduler:
instanceName: MyScheduler
instanceId: AUTO
jobStore:
class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
tablePrefix: QRTZ_
isClustered: true
misfireThreshold: 12000
clusterCheckinInterval: 15000
threadPool:
class: org.quartz.simpl.SimpleThreadPool
threadCount: 10
threadPriority: 5
threadsInheritContextClassLoaderOfInitializingThread: true
#json 时间戳统一转换
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
aop:
proxy-target-class: true
jpa:
open-in-view: false
#配置freemarker
freemarker:
# 设置模板后缀名
suffix: .ftl
# 设置文档类型
content-type: text/html
# 设置页面编码格式
charset: UTF-8
# 设置页面缓存
cache: false
prefer-file-system-access: false
# 设置ftl文件路径
template-loader-path:
- classpath:/templates
template_update_delay: 0
# 设置静态文件路径，js,css等
mvc:
static-path-pattern: /**
#Spring Boot 2.6+后映射匹配的默认策略已从AntPathMatcher更改为PathPatternParser,需要手动指定为ant-path-matcher
pathmatch:
matching-strategy: ant_path_matcher
resource:
static-locations: classpath:/static/,classpath:/public/
autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
datasource:
druid:
stat-view-servlet:
enabled: true
loginUsername: admin
loginPassword: 123456
allow:
web-stat-filter:
enabled: true
dynamic:
druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
# 连接池的配置信息
# 初始化大小，最小，最大
initial-size: 5
min-idle: 5
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间，单位是毫秒
minEvictableIdleTimeMillis: 300000
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
# 打开PSCache，并且指定每个连接上PSCache的大小
poolPreparedStatements: true
maxPoolPreparedStatementPerConnectionSize: 20
# 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
filters: stat,wall,slf4j
# 通过connectProperties属性来打开mergeSql功能；慢SQL记录
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource:
master:
url: jdbc:mysql://127.0.0.1:3306/hzgw_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
username: root
password: superAdmin&321
driver-class-name: com.mysql.jdbc.Driver
# 多数据源配置
#multi-datasource1:
#url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
#username: root
#password: root
#driver-class-name: com.mysql.cj.jdbc.Driver
#redis 配置
redis:
database: 1
host: 127.0.0.1
lettuce:
pool:
max-active: 8 #最大连接数据库连接数,设 0 为没有限制
max-idle: 8 #最大等待连接中的数量,设 0 为没有限制
max-wait: -1ms #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
min-idle: 0 #最小等待连接中的数量,设 0 为没有限制
shutdown-timeout: 100ms
password: 'redis@123'
port: 6773
#mybatis plus 设置
mybatis-plus:
mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
global-config:
# 关闭MP3.0自带的banner
banner: false
db-config:
#主键类型
id-type: ASSIGN_ID
# 默认数据库表下划线命名
table-underline: true
configuration:
# 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# 返回类型为Map,显示null对应的字段
call-setters-on-nulls: true
#jeecg专用配置
minidao:
base-package: org.jeecg.modules.jmreport.*
jeecg:
# 是否启用安全模式
safeMode: false
# 签名密钥串(前后端要一致，正式发布请自行修改)
signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
# 签名拦截接口
signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
# local\minio\alioss
uploadType: local
# 前端访问地址
domainUrl:
pc: http://localhost:3100
app: http://localhost:8051
path:
#文件上传根目录 设置
upload: /opt/ztgk/file
#webapp文件路径
webapp: /opt/ztgk/file
shiro:
excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
#阿里云oss存储和大鱼短信秘钥配置
oss:
accessKey: ??
secretKey: ??
endpoint: oss-cn-beijing.aliyuncs.com
bucketName: jeecgdev
staticDomain: https://static.jeecg.com
# ElasticSearch 设置
elasticsearch:
cluster-name: jeecg-ES
cluster-nodes: 81.70.47.128:9200
check-enabled: false
# 在线预览文件服务器地址配置
file-view-domain: http://47.94.207.62
# minio文件上传
minio:
minio_url: http://minio.jeecg.com
minio_name: ??
minio_pass: ??
bucketName: ??
#大屏报表参数设置
jmreport:
mode: prod
#数据字典是否进行saas数据隔离，自己看自己的字典
saas: false
#是否开启租户模式 Support By v1.5.5+
openTenant: false
#安全模式(敏感接口校验、saas模式下不允许使用平台数据源)
#safeMode: true
#是否需要校验token
is_verify_token: false
#必须校验方法
verify_methods: remove,delete,save,add,update
#xxl-job配置
xxljob:
enabled: false
adminAddresses: http://127.0.0.1:9080/xxl-job-admin
appname: ${spring.application.name}
accessToken: ''
address: 127.0.0.1:30007
ip: 127.0.0.1
port: 30007
logPath: logs/jeecg/job/jobhandler/
logRetentionDays: 30
#分布式锁配置
redisson:
address: 127.0.0.1:6379
password:
type: STANDALONE
enabled: true
#Mybatis输出sql日志
logging:
level:
org.jeecg.modules.system.mapper: info
#cas单点登录
cas:
prefixUrl: http://cas.example.org:8443/cas
#swagger
knife4j:
#开启增强配置
enable: true
#开启生产环境屏蔽
production: false
basic:
enable: false
username: jeecg
password: jeecg1314
#第三方登录
justauth:
enabled: true
type:
GITHUB:
client-id: ??
client-secret: ??
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
WECHAT_ENTERPRISE:
client-id: ??
client-secret: ??
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
agent-id: ??
DINGTALK:
client-id: ??
client-secret: ??
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
WECHAT_OPEN:
client-id: ??
client-secret: ??
redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
cache:
type: default
prefix: 'demo::'
timeout: 1h
#第三方APP对接
third-app:
enabled: false
type:
#企业微信
WECHAT_ENTERPRISE:
enabled: false
#CORP_ID
client-id: ??
#SECRET
client-secret: ??
#自建应用id
agent-id: ??
#自建应用秘钥（新版企微需要配置）
# agent-app-secret: ??
#钉钉
DINGTALK:
enabled: false
# appKey
client-id: ??
# appSecret
client-secret: ??
agent-id: ??
\ No newline at end of file
jeecg-module-system/src/main/resources/application.yml
View file @ 063d0581
......@@ -2,4 +2,4 @@ spring:
application:
name: jeecg-system
profiles:
active: dev
active: @package.environment@
pom.xml
View file @ 063d0581
......@@ -28,10 +28,8 @@
<xxl-job-core.version>2.2.0</xxl-job-core.version>
<fastjson.version>1.2.83</fastjson.version>
<pegdown.version>1.6.0</pegdown.version>
<!-- 数据库驱动 -->
<postgresql.version>42.2.25</postgresql.version>
<ojdbc6.version>11.2.0.3</ojdbc6.version>
<sqljdbc4.version>4.0</sqljdbc4.version>
<mysql-connector-java.version>8.0.27</mysql-connector-java.version>
<hutool.version>5.8.20</hutool.version>
......@@ -41,8 +39,6 @@
<druid.version>1.1.22</druid.version>
<minidao.version>1.9.0</minidao.version>
<!-- 积木报表-->
<jimureport-spring-boot-starter.version>1.5.8</jimureport-spring-boot-starter.version>
<commons.version>2.6</commons.version>
<aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>
<aliyun.oss.version>3.11.2</aliyun.oss.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment