FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_3' into 'develop_master'

Browse Source 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!368
This commit is contained in:
super_liu
2022-01-11 22:55:54 +08:00
parent 654e7e8127 d01ea4592d
commit e2bbc146ae
9 changed files with 72 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class ScheduledJob {
private IWarningDateService iWarningDateService;// 预警日期
// @PostConstruct //程序启动时执行一次
@Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行
// @Scheduled(cron = "0 0 0 * * ?") //每天的凌晨0点执行
// @Scheduled(cron="*/5 * * * * ?")
// @Scheduled(fixedDelay = 120000)
@Async
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
+2
View File
@@ -41,5 +41,7 @@ public interface ISarBussionessStandService extends IService<SarBussionessStand>
List<SarBussionessStand> queryByList(SarBussionessStandEOPage sarBussionessStandEOPage);
List<SarBussionessStand> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception;
List<SarBussionessStand> getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+29
View File
@@ -916,6 +916,35 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
return sarlist;
}
@Override
public List<SarBussionessStand> getSarBussionStandPageQd(SarBussionessStandEOPage page) throws Exception {
//查询当前登录人角色拥有权限的菜单
if(page.getMenuId() != null && page.getUserId() != null && StringUtils.isNotBlank(page.getUserId())){
QueryWrapper<TsResource> qw = new QueryWrapper<>();
qw.eq("ID",page.getMenuId());
qw.isNull("PARENT_ID");
List<TsResource> children = iTsResourceService.list(qw);
if(children.isEmpty() && !page.getMenuId().equals("nomenu")){
List<String> getMenuIdList = tsUserService.getResourceUserId(page.getUserId());
if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList);
} else {
page.setMenuRoleList(null);
}
List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
if (ids != null && !ids.isEmpty()) {
page.setMenuAllChildrenIdList(ids);
}
}
}
Integer rowCount = this.baseMapper.getBussionessStandInfoCount(page);
page.getPager().setRowCount(rowCount);
List<SarBussionessStand> sarlist = this.baseMapper.getBussionessStandInfoPage(page);
attrInfo(sarlist);
return sarlist;
}
/***
* @Description: 处理属性表数据
* @Param: [sarlist]
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/StandWarningEO.java
+2 -2
View File
@@ -83,10 +83,10 @@ public class StandWarningEO extends EarlyWarningEO {
@ExcelIgnore
@ApiModelProperty("范围查询发布日期开始")
@DateTimeFormat(pattern = "YYYY-MM-dd")
private String startPutTime;
private String startIssueTime;
@ExcelIgnore
@ApiModelProperty("范围查询发布日期结束")
@DateTimeFormat(pattern = "YYYY-MM-dd")
private String endPutTime;
private String endIssueTime;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java
+1 -1
View File
@@ -486,7 +486,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
if (!file1.exists()) {
file1.mkdirs();
}
String filepathandname = filePath + "/img/" + imageName;
String filepathandname = splitFilePath +"/" + imageName;
try {
FileOutputStream fos = new FileOutputStream(filepathandname);
fos.write(bytev);
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/EarlyWraningEOMapper.xml
+9 -9
View File
@@ -9,7 +9,7 @@
<result column="STAND_TYPE" property="standType"></result>
<result column="STAND_CODE" property="standCode"></result>
<result column="STAND_NAME" property="standName"></result>
<result column="PUT_TIME" property="putTime"></result>
<result column="ISSUE_TIME" property="issueTime"></result>
<result column="APPLY_TYPE" property="applyType"></result>
<result column="DUTY_ENGINEER" property="dutyEngineer"></result>
<result column="ITEMS_ID" property="itemsId"></result>
@@ -31,7 +31,7 @@
sarInfo.STAND_TYPE,
CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE,
sarInfo.STAND_NAME,
sarInfo.PUT_TIME,
sarInfo.ISSUE_TIME,
attr.SSRQ as SSRQ
</sql>
@@ -50,15 +50,15 @@
<if test="waringEO.standName != null and waringEO.standName != ''">
AND sarInfo.STAND_NAME like concat('%', #{waringEO.standName},'%')
</if>
<if test="waringEO.startPutTime != null and waringEO.startPutTime != '' and waringEO.endPutTime != null and waringEO.endPutTime != '' ">
<if test="waringEO.startIssueTime != null and waringEO.startIssueTime != '' and waringEO.endIssueTime != null and waringEO.endIssueTime != '' ">
AND (
DATE_FORMAT(sarInfo.PUT_TIME, '%Y-%m-%d') &gt;= DATE_FORMAT(
#{waringEO.endPutTime},
DATE_FORMAT(sarInfo.ISSUE_TIME, '%Y-%m-%d') &gt;= DATE_FORMAT(
#{waringEO.startIssueTime},
'%Y-%m-%d'
)
AND
DATE_FORMAT( sarInfo.PUT_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
#{waringEO.endPutTime},
DATE_FORMAT( sarInfo.ISSUE_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(
#{waringEO.endIssueTime},
'%Y-%m-%d'
)
)
@@ -79,7 +79,7 @@
sarInfo.STAND_TYPE,
CONCAT(sarInfo.STAND_SORT,' ',sarInfo.STAND_NUMBER,'-',sarInfo.STAND_YEAR) AS STAND_CODE,
sarInfo.STAND_NAME,
sarInfo.PUT_TIME,
sarInfo.ISSUE_TIME,
attr.SSRQ as SSRQ,
case stand_type
when 'INLAND' then '国内标准'
@@ -223,7 +223,7 @@
<if test="waringEO.startZCCSSRQ != null and waringEO.startZCCSSRQ != '' and waringEO.endZCCSSRQ != null and waringEO.endZCCSSRQ != ''">
AND (
sarInfo.ID IN (SELECT DISTINCT law_id FROM warning_date as t WHERE
DATE_FORMAT(t.SSRQ, '%Y-%m-%d') between DATE_FORMAT(#{waringEO.startZCCSSRQ}, '%Y-%m-%d') AND DATE_FORMAT(#{waringEO.startZCCSSRQ}, '%Y-%m-%d')
DATE_FORMAT(t.SSRQ, '%Y-%m-%d') between DATE_FORMAT(#{waringEO.startZCCSSRQ}, '%Y-%m-%d') AND DATE_FORMAT(#{waringEO.endZCCSSRQ}, '%Y-%m-%d')
AND t.time_name = 'ZCCSSRQ' )
)
</if>