Skip to content

A
amos-boot-zx-biz
Commit 18a592a5 authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

修复bug

parent f7700935
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 42 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/TdHygfJpInverterWarnMapper.java
View file @ 18a592a5
...@@ -36,11 +36,11 @@ public interface TdHygfJpInverterWarnMapper extends BaseMapper<TdHygfJpInverterW ...@@ -36,11 +36,11 @@ public interface TdHygfJpInverterWarnMapper extends BaseMapper<TdHygfJpInverterW
List<TdHygfJpInverterWarnDto> selectWarnList(List<String> state, String regionalCompaniesCode, String amosCompanyCode, String thirdStationId, String type, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, Integer current, Integer size, String handlerStatus, String stationName,String isDeal); List<TdHygfJpInverterWarnDto> selectWarnList(List<String> state, String regionalCompaniesCode, String amosCompanyCode, String thirdStationId, String type, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, Integer current, Integer size, String handlerStatus, String stationName,String isDeal);
@UserEmpower(field = {"regional_companies_code"}, dealerField = {"amos_company_code", "regional_companies_code"}, fieldConditions = {"eq", "in"}, relationship = "and") @UserEmpower(field = {"regional_companies_code"}, dealerField = {"amos_company_code", "regional_companies_code"}, fieldConditions = {"eq", "in"}, relationship = "and")
int selectWarnListTotal(List<String> state,String regionalCompaniesCode, String amosCompanyCode, String thirdStationId, String type, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, String handlerStatus, String stationName,String isDeal); Integer selectWarnListTotal(List<String> state,String regionalCompaniesCode, String amosCompanyCode, String thirdStationId, String type, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, String handlerStatus, String stationName,String isDeal);
@UserEmpower(field = {"regional_companies_code"}, dealerField = {"amos_company_code", "regional_companies_code"}, fieldConditions = {"eq", "in"}, relationship = "and") @UserEmpower(field = {"regional_companies_code"}, dealerField = {"amos_company_code", "regional_companies_code"}, fieldConditions = {"eq", "in"}, relationship = "and")
int selectWarnTotal(List<String> state, String regionalCompaniesCode, Integer selectWarnTotal(List<String> state, String regionalCompaniesCode,
String amosCompanyCode, String amosCompanyCode,
String thirdStationId, String thirdStationId,
String type); String type);
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/StatisticsHomepageMapper.xml
View file @ 18a592a5
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
SUM( CASE WHEN preparation_money_state = '待发货' or preparation_money_state = '暂存发货'or preparation_money_state = '待补货' THEN 1 ELSE 0 END ) AS '待发货', SUM( CASE WHEN preparation_money_state = '待发货' or preparation_money_state = '暂存发货'or preparation_money_state = '待补货' THEN 1 ELSE 0 END ) AS '待发货',
SUM( CASE WHEN preparation_money_state = '已收货' THEN 1 ELSE 0 END ) AS '已收货', SUM( CASE WHEN preparation_money_state = '已收货' THEN 1 ELSE 0 END ) AS '已收货',
ROUND(COALESCE(SUM( CASE WHEN preparation_money_state = '已收货' THEN ei.real_scale ELSE 0 END ), 0), 2) AS yshrl, ROUND(COALESCE(SUM( CASE WHEN preparation_money_state = '已收货' THEN ei.real_scale ELSE 0 END ), 0), 2) AS yshrl,
SUM( CASE WHEN preparation_money_state = '待收货' THEN 1 ELSE 0 END ) AS '已发货', SUM( CASE WHEN preparation_money_state = '待收货' THEN 1 ELSE 0 END ) AS '待收货',
SUM( CASE WHEN preparation_money_state = '备货完成' THEN 1 ELSE 0 END ) AS '备货完成', SUM( CASE WHEN preparation_money_state = '备货完成' THEN 1 ELSE 0 END ) AS '备货完成',
ROUND(COALESCE(SUM( CASE WHEN preparation_money_state = '备货完成' THEN ei.real_scale ELSE 0 END ), 0), 2) AS bhwcrl ROUND(COALESCE(SUM( CASE WHEN preparation_money_state = '备货完成' THEN ei.real_scale ELSE 0 END ), 0), 2) AS bhwcrl
...@@ -627,7 +627,7 @@ ...@@ -627,7 +627,7 @@
IFNULL(SUM( CASE WHEN preparation_money_state = '待发货' or preparation_money_state = '暂存发货' or preparation_money_state = '待补货' THEN 1 ELSE 0 END ), 0 ) AS dfh, IFNULL(SUM( CASE WHEN preparation_money_state = '待发货' or preparation_money_state = '暂存发货' or preparation_money_state = '待补货' THEN 1 ELSE 0 END ), 0 ) AS dfh,
IFNULL(SUM( CASE WHEN preparation_money_state = '已收货' THEN 1 ELSE 0 END ), 0 ) AS ysh, IFNULL(SUM( CASE WHEN preparation_money_state = '已收货' THEN 1 ELSE 0 END ), 0 ) AS ysh,
IFNULL(SUM( CASE WHEN preparation_money_state = '已收货' THEN ei.real_scale ELSE 0 END ), 0 ) AS yshrl, IFNULL(SUM( CASE WHEN preparation_money_state = '已收货' THEN ei.real_scale ELSE 0 END ), 0 ) AS yshrl,
IFNULL(SUM( CASE WHEN preparation_money_state = '待收货' THEN 1 ELSE 0 END ), 0 ) AS yfh, IFNULL(SUM( CASE WHEN preparation_money_state = '待收货' THEN 1 ELSE 0 END ), 0 ) AS dsh,
IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成' THEN 1 ELSE 0 END ), 0 ) AS bhwc, IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成' THEN 1 ELSE 0 END ), 0 ) AS bhwc,
IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成' THEN ei.real_scale ELSE 0 END ), 0 ) AS bhwcrl IFNULL(SUM( CASE WHEN preparation_money_state = '备货完成' THEN ei.real_scale ELSE 0 END ), 0 ) AS bhwcrl
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/DayGenerateMapper.xml
View file @ 18a592a5
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
FROM house_pv_data.td_hygf_station_generate_month FROM house_pv_data.td_hygf_station_generate_month
<where> <where>
<if test="dto!=null"> <if test="dto!=null and dto.size()> 0">
third_station_id in third_station_id in
<foreach collection="dto" item="item" index="index" open="(" separator="," close=")"> <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
#{item.thirdStationId} #{item.thirdStationId}
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
`day_time` date `day_time` date
FROM house_pv_data.td_hygf_station_generate_month FROM house_pv_data.td_hygf_station_generate_month
<where> <where>
<if test="dto!=null"> <if test="dto!=null and dto.size()> 0">
third_station_id in third_station_id in
<foreach collection="dto" item="item" index="index" open="(" separator="," close=")"> <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
FROM house_pv_data.td_hygf_station_generate_year FROM house_pv_data.td_hygf_station_generate_year
<where> <where>
<if test="dto!=null"> <if test="dto!=null and dto.size()> 0">
third_station_id in third_station_id in
<foreach collection="dto" item="item" index="index" open="(" separator="," close=")"> <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
`year_time` date `year_time` date
FROM house_pv_data.td_hygf_station_generate_all FROM house_pv_data.td_hygf_station_generate_all
<where> <where>
<if test="dto!=null"> <if test="dto!=null and dto.size()> 0">
third_station_id in third_station_id in
<foreach collection="dto" item="item" index="index" open="(" separator="," close=")"> <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
* *
FROM house_pv_data.td_hygf_station_generate_month FROM house_pv_data.td_hygf_station_generate_month
<where> <where>
<if test="dto!=null"> <if test="dto!=null and dto.size()> 0">
third_station_id in third_station_id in
<foreach collection="dto" item="item" index="index" open="(" separator="," close=")"> <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/HourGenerateMapper.xml
View file @ 18a592a5
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
`hour` date `hour` date
FROM house_pv_data.td_hygf_station_generate_day FROM house_pv_data.td_hygf_station_generate_day
<where> <where>
<if test="dto!=null"> <if test="dto!=null and dto.size()> 0">
third_station_id in third_station_id in
<foreach collection="dto" item="item" index="index" open="(" separator="," close=")"> <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/MonthGenerateMapper.xml
View file @ 18a592a5
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
FROM house_pv_data.td_hygf_station_generate_year FROM house_pv_data.td_hygf_station_generate_year
<where> <where>
<if test="dto!=null"> <if test="dto!=null and dto.size()> 0">
third_station_id in third_station_id in
<foreach collection="dto" item="item" index="index" open="(" separator="," close=")"> <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/MonthPowerMapper.xml
View file @ 18a592a5
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
FROM house_pv_data.td_hygf_station_power_day FROM house_pv_data.td_hygf_station_power_day
<where> <where>
<if test="dto!=null"> <if test="dto!=null and dto.size()> 0">
third_station_id in third_station_id in
<foreach collection="dto" item="item" index="index" open="(" separator="," close=")"> <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHygfJpInverterWarnMapper.xml
View file @ 18a592a5
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
SELECT `state`,count(`state`) num SELECT `state`,count(`state`) num
FROM house_pv_data.td_hygf_jp_inverter_warn FROM house_pv_data.td_hygf_jp_inverter_warn
<where> <where>
<if test="dto!=null"> <if test="dto!=null and dto.size()> 0">
third_station_id in third_station_id in
<foreach collection="dto" item="item" index="index" open="(" separator="," close=")"> <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
#{item.thirdStationId} #{item.thirdStationId}
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/YearGenerateMapper.xml
View file @ 18a592a5
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
FROM house_pv_data.td_hygf_station_generate_all FROM house_pv_data.td_hygf_station_generate_all
<where> <where>
<if test="dto!=null"> <if test="dto!=null and dto.size()> 0">
third_station_id in third_station_id in
<foreach collection="dto" item="item" index="index" open="(" separator="," close=")"> <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PersonnelBusinessController.java
View file @ 18a592a5
...@@ -257,7 +257,6 @@ public class PersonnelBusinessController extends BaseController { ...@@ -257,7 +257,6 @@ public class PersonnelBusinessController extends BaseController {
throw new BadRequest("修改状态失败！"); throw new BadRequest("修改状态失败！");
}else{ }else{
userMessageMapper.insert(userMessage); userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE" , JSON.toJSONString(userMessage).getBytes(), 2 ,false);
} }
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.java
View file @ 18a592a5
...@@ -335,8 +335,8 @@ public class TdHygfJpInverterWarnController extends BaseController { ...@@ -335,8 +335,8 @@ public class TdHygfJpInverterWarnController extends BaseController {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
int wcl = tdHygfJpInverterWarnServiceImpl.selectWarnTotal(Arrays.asList("未处理", "未确认"), regionalCompaniesCode, amosCompanyCode, thirdStationId, type); Integer wcl = tdHygfJpInverterWarnServiceImpl.selectWarnTotal(Arrays.asList("未处理", "未确认"), regionalCompaniesCode, amosCompanyCode, thirdStationId, type);
int ycl = tdHygfJpInverterWarnServiceImpl.selectWarnTotal(Arrays.asList("已处理", "已恢复","已关闭"), regionalCompaniesCode, amosCompanyCode, thirdStationId, type); Integer ycl = tdHygfJpInverterWarnServiceImpl.selectWarnTotal(Arrays.asList("已处理", "已恢复","已关闭"), regionalCompaniesCode, amosCompanyCode, thirdStationId, type);
result.put("wcl", wcl); result.put("wcl", wcl);
result.put("ycl", ycl); result.put("ycl", ycl);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java
View file @ 18a592a5
...@@ -436,7 +436,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J ...@@ -436,7 +436,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy-MM-dd")); reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy-MM-dd"));
} }
LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>(); LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
wapper.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),DayGenerate::getThirdStationId,reviewDto.getThirdStationIds()); wapper.in(CollectionUtil.isNotEmpty(reviewDto.getThirdStationIds()),DayGenerate::getThirdStationId,reviewDto.getThirdStationIds());
wapper.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),DayGenerate::getDayTime,reviewDto.getTimeDate()); wapper.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),DayGenerate::getDayTime,reviewDto.getTimeDate());
wapper.eq(!StringUtils.isEmpty(reviewDto.getState()),DayGenerate::getStationState,reviewDto.getState()); wapper.eq(!StringUtils.isEmpty(reviewDto.getState()),DayGenerate::getStationState,reviewDto.getState());
wapper.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),DayGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode()); wapper.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),DayGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
...@@ -451,7 +451,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J ...@@ -451,7 +451,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy-MM")); reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy-MM"));
} }
LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>(); LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>();
wapper1.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),MonthGenerate::getThirdStationId,reviewDto.getThirdStationIds()); wapper1.in(CollectionUtil.isNotEmpty(reviewDto.getThirdStationIds()),MonthGenerate::getThirdStationId,reviewDto.getThirdStationIds());
wapper1.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),MonthGenerate::getMonthTime,reviewDto.getTimeDate()); wapper1.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),MonthGenerate::getMonthTime,reviewDto.getTimeDate());
wapper1.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),MonthGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode()); wapper1.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),MonthGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
//拦截拼接权限 //拦截拼接权限
...@@ -466,7 +466,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J ...@@ -466,7 +466,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy")); reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy"));
} }
LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>(); LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>();
wapper2.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),YearGenerate::getThirdStationId,reviewDto.getThirdStationIds()); wapper2.in(CollectionUtil.isNotEmpty(reviewDto.getThirdStationIds()),YearGenerate::getThirdStationId,reviewDto.getThirdStationIds());
wapper2.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),YearGenerate::getYear,reviewDto.getTimeDate()); wapper2.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),YearGenerate::getYear,reviewDto.getTimeDate());
wapper2.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),YearGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode()); wapper2.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),YearGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
//拦截拼接权限 //拦截拼接权限
...@@ -762,7 +762,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J ...@@ -762,7 +762,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
switch (type) { switch (type) {
case "day": case "day":
LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>(); LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
wapper.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),DayGenerate::getThirdStationId, reviewDto.getThirdStationIds()); wapper.in(CollectionUtil.isNotEmpty(reviewDto.getThirdStationIds()),DayGenerate::getThirdStationId, reviewDto.getThirdStationIds());
wapper.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), DayGenerate::getDayTime, reviewDto.getTimeDate()); wapper.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), DayGenerate::getDayTime, reviewDto.getTimeDate());
wapper.eq(reviewDto.getState() != null&&!reviewDto.getState().equals(""), DayGenerate::getStationState, reviewDto.getState()); wapper.eq(reviewDto.getState() != null&&!reviewDto.getState().equals(""), DayGenerate::getStationState, reviewDto.getState());
wapper.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),DayGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode()); wapper.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),DayGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
...@@ -776,7 +776,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J ...@@ -776,7 +776,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
break; break;
case "month": case "month":
LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>(); LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>();
wapper1.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),MonthGenerate::getThirdStationId, reviewDto.getThirdStationIds()); wapper1.in(CollectionUtil.isNotEmpty(reviewDto.getThirdStationIds()),MonthGenerate::getThirdStationId, reviewDto.getThirdStationIds());
wapper1.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), MonthGenerate::getMonthTime, reviewDto.getTimeDate()); wapper1.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), MonthGenerate::getMonthTime, reviewDto.getTimeDate());
wapper1.eq(reviewDto.getState() != null&&!reviewDto.getState().equals(""), MonthGenerate::getStationState, reviewDto.getState()); wapper1.eq(reviewDto.getState() != null&&!reviewDto.getState().equals(""), MonthGenerate::getStationState, reviewDto.getState());
wapper1.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),MonthGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode()); wapper1.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),MonthGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
...@@ -789,7 +789,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J ...@@ -789,7 +789,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
break; break;
case "year": case "year":
LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>(); LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>();
wapper2.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),YearGenerate::getThirdStationId, reviewDto.getThirdStationIds()); wapper2.in(CollectionUtil.isNotEmpty(reviewDto.getThirdStationIds()),YearGenerate::getThirdStationId, reviewDto.getThirdStationIds());
wapper2.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), YearGenerate::getYear, reviewDto.getTimeDate()); wapper2.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), YearGenerate::getYear, reviewDto.getTimeDate());
wapper2.eq(reviewDto.getState() != null&&!reviewDto.getState().equals(""), YearGenerate::getStationState, reviewDto.getState()); wapper2.eq(reviewDto.getState() != null&&!reviewDto.getState().equals(""), YearGenerate::getStationState, reviewDto.getState());
wapper2.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),YearGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode()); wapper2.eq(!StringUtils.isEmpty(reviewDto.getRegionalCompaniesCode()),YearGenerate::getRegionalCompaniesCode,reviewDto.getRegionalCompaniesCode());
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java
View file @ 18a592a5
...@@ -883,8 +883,8 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto ...@@ -883,8 +883,8 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
if(CollectionUtil.isNotEmpty(householdContracts)){ if(CollectionUtil.isNotEmpty(householdContracts)){
for (HouseholdContract householdContract : householdContracts) { for (HouseholdContract householdContract : householdContracts) {
LambdaQueryWrapper<ToDoTasks> wrapper2 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ToDoTasks> wrapper2 = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getBusinessId,householdContract.getSequenceNbr()); wrapper2.eq(ToDoTasks::getBusinessId,householdContract.getSequenceNbr());
wrapper.eq(ToDoTasks::getType,TaskTypeStationEnum.合同.getCode()); wrapper2.eq(ToDoTasks::getType,TaskTypeStationEnum.合同.getCode());
toDoTasksServiceImpl.remove(wrapper2); toDoTasksServiceImpl.remove(wrapper2);
} }
} }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java
View file @ 18a592a5
...@@ -472,7 +472,6 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD ...@@ -472,7 +472,6 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
UserMessage userMessage = new UserMessage(TaskTypeStationEnum.设置管理员.getCode(), personnelBusines.getSequenceNbr(), userIds.toString(), new Date(), "您已成为单位管理员。", personnelBusines.getAmosUnitOrgCode()); UserMessage userMessage = new UserMessage(TaskTypeStationEnum.设置管理员.getCode(), personnelBusines.getSequenceNbr(), userIds.toString(), new Date(), "您已成为单位管理员。", personnelBusines.getAmosUnitOrgCode());
userMessageMapper.insert(userMessage); userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2, false);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/TdHygfJpInverterWarnServiceImpl.java
View file @ 18a592a5
...@@ -186,15 +186,17 @@ public class TdHygfJpInverterWarnServiceImpl ...@@ -186,15 +186,17 @@ public class TdHygfJpInverterWarnServiceImpl
return list; return list;
} }
public int selectWarnListTotal(List<String> state,String regionalCompaniesCode, String amosCompanyCode, String thirdStationId, String type, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, String handlerStatus, String stationName,String isDeal) { public Integer selectWarnListTotal(List<String> state,String regionalCompaniesCode, String amosCompanyCode, String thirdStationId, String type, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, String handlerStatus, String stationName,String isDeal) {
return tdHygfJpInverterWarnMapper.selectWarnListTotal(state,regionalCompaniesCode,amosCompanyCode,thirdStationId,type, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, handlerStatus, stationName,isDeal); Integer count = tdHygfJpInverterWarnMapper.selectWarnListTotal(state, regionalCompaniesCode, amosCompanyCode, thirdStationId, type, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, handlerStatus, stationName, isDeal);
return count == null ? 0:count;
} }
public int selectWarnTotal(List<String> state,String regionalCompaniesCode, public Integer selectWarnTotal(List<String> state,String regionalCompaniesCode,
String amosCompanyCode, String amosCompanyCode,
String thirdStationId, String thirdStationId,
String type) { String type) {
return tdHygfJpInverterWarnMapper.selectWarnTotal(state,regionalCompaniesCode, amosCompanyCode, thirdStationId, type); Integer count = tdHygfJpInverterWarnMapper.selectWarnTotal(state, regionalCompaniesCode, amosCompanyCode, thirdStationId, type);
return count == null ? 0:count;
} }
public Map<String, Object> queryAlarmNumber(String regionalCompaniesCode, String amosCompanyCode, String thirdStationId, String type) { public Map<String, Object> queryAlarmNumber(String regionalCompaniesCode, String amosCompanyCode, String thirdStationId, String type) {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/ToDoTasksServiceImpl.java
View file @ 18a592a5
...@@ -117,10 +117,8 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T ...@@ -117,10 +117,8 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
doTask.setState("已办"); doTask.setState("已办");
doTask.setCompleteTime(new Date()); doTask.setCompleteTime(new Date());
toDoTasksMapper.updateById(doTask); toDoTasksMapper.updateById(doTask);
emqKeeper.getMqttClient().publish("TASK_MESSAGE", JSON.toJSONString(doTask).getBytes(), 2, false);
UserMessage userMessage = new UserMessage(doTask.getType(), doTask.getBusinessId(), doTask.getAmosUserId(), new Date(), doTask.getTaskName() + ",此消息已确认." + meg, doTask.getAmosOrgCode()); UserMessage userMessage = new UserMessage(doTask.getType(), doTask.getBusinessId(), doTask.getAmosUserId(), new Date(), doTask.getTaskName() + ",此消息已确认." + meg, doTask.getAmosOrgCode());
userMessageMapper.insert(userMessage); userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2, false);
} }
} else { } else {
log.error("没有查询到待办,不进行更新和发送消息"); log.error("没有查询到待办,不进行更新和发送消息");
...@@ -167,10 +165,9 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T ...@@ -167,10 +165,9 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
toDoTasks.setAmosUserId(userIds.toString()); toDoTasks.setAmosUserId(userIds.toString());
toDoTasks.setSequenceNbr(sequence.nextId()); toDoTasks.setSequenceNbr(sequence.nextId());
toDoTasksMapper.insert(toDoTasks); toDoTasksMapper.insert(toDoTasks);
emqKeeper.getMqttClient().publish("TASK_MESSAGE", JSON.toJSONString(toDoTasks).getBytes(), 2, false);
UserMessage userMessage = new UserMessage(toDoTasks.getType(), toDoTasks.getBusinessId(), toDoTasks.getAmosUserId(), new Date(), toDoTasks.getTaskName(), toDoTasks.getAmosOrgCode()); UserMessage userMessage = new UserMessage(toDoTasks.getType(), toDoTasks.getBusinessId(), toDoTasks.getAmosUserId(), new Date(), toDoTasks.getTaskName(), toDoTasks.getAmosOrgCode());
userMessageMapper.insert(userMessage); userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2, false);
} else { } else {
log.error("用户为空,不进行添加待办和发送消息"); log.error("用户为空,不进行添加待办和发送消息");
} }
...@@ -193,18 +190,15 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T ...@@ -193,18 +190,15 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
doTasks.setState("已办"); doTasks.setState("已办");
doTasks.setCompleteTime(new Date()); doTasks.setCompleteTime(new Date());
toDoTasksMapper.updateById(doTasks); toDoTasksMapper.updateById(doTasks);
emqKeeper.getMqttClient().publish("TASK_MESSAGE", JSON.toJSONString(doTasks).getBytes(), 2, false);
UserMessage userMessage = new UserMessage(doTasks.getType(), doTasks.getBusinessId(), doTasks.getAmosUserId(), new Date(), doTasks.getTaskName() + ",此消息已确认." + meg, doTasks.getAmosOrgCode()); UserMessage userMessage = new UserMessage(doTasks.getType(), doTasks.getBusinessId(), doTasks.getAmosUserId(), new Date(), doTasks.getTaskName() + ",此消息已确认." + meg, doTasks.getAmosOrgCode());
userMessageMapper.insert(userMessage); userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2, false);
} }
toDoTasks.setAmosUserId(userId); toDoTasks.setAmosUserId(userId);
toDoTasksMapper.insert(toDoTasks); toDoTasksMapper.insert(toDoTasks);
emqKeeper.getMqttClient().publish("TASK_MESSAGE", JSON.toJSONString(toDoTasks).getBytes(), 2, false);
UserMessage userMessage = new UserMessage(toDoTasks.getType(), toDoTasks.getBusinessId(), toDoTasks.getAmosUserId(), new Date(), toDoTasks.getTaskName(), toDoTasks.getAmosOrgCode()); UserMessage userMessage = new UserMessage(toDoTasks.getType(), toDoTasks.getBusinessId(), toDoTasks.getAmosUserId(), new Date(), toDoTasks.getTaskName(), toDoTasks.getAmosOrgCode());
userMessageMapper.insert(userMessage); userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2, false);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }
...@@ -226,11 +220,9 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T ...@@ -226,11 +220,9 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
doTasks.setState("已办"); doTasks.setState("已办");
doTasks.setCompleteTime(new Date()); doTasks.setCompleteTime(new Date());
toDoTasksMapper.updateById(doTasks); toDoTasksMapper.updateById(doTasks);
emqKeeper.getMqttClient().publish("TASK_MESSAGE", JSON.toJSONString(doTasks).getBytes(), 2, false);
UserMessage userMessage = new UserMessage(doTasks.getType(), doTasks.getBusinessId(), doTasks.getAmosUserId(), new Date(), doTasks.getTaskName() + "已完成." + meg, doTasks.getAmosOrgCode()); UserMessage userMessage = new UserMessage(doTasks.getType(), doTasks.getBusinessId(), doTasks.getAmosUserId(), new Date(), doTasks.getTaskName() + "已完成." + meg, doTasks.getAmosOrgCode());
userMessageMapper.insert(userMessage); userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2, false);
} }
...@@ -276,11 +268,10 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T ...@@ -276,11 +268,10 @@ public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto, ToDoTasks, T
} }
toDoTasksMapper.insert(toDoTasks); toDoTasksMapper.insert(toDoTasks);
emqKeeper.getMqttClient().publish("TASK_MESSAGE", JSON.toJSONString(toDoTasks).getBytes(), 2, false);
UserMessage userMessage = new UserMessage(toDoTasks.getType(), toDoTasks.getBusinessId(), toDoTasks.getAmosUserId(), new Date(), toDoTasks.getTaskName() + "待完成", toDoTasks.getAmosOrgCode()); UserMessage userMessage = new UserMessage(toDoTasks.getType(), toDoTasks.getBusinessId(), toDoTasks.getAmosUserId(), new Date(), toDoTasks.getTaskName() + "待完成", toDoTasks.getAmosOrgCode());
userMessageMapper.insert(userMessage); userMessageMapper.insert(userMessage);
emqKeeper.getMqttClient().publish("MY_MESSAGE", JSON.toJSONString(userMessage).getBytes(), 2, false);
} }
} catch (Exception e) { } catch (Exception e) {
......
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