diff --git a/cu.zip b/jar/依赖jar/(联通依赖包)cu.zip similarity index 100% rename from cu.zip rename to jar/依赖jar/(联通依赖包)cu.zip diff --git a/sql/必须执行/yunze-iotapi--2024-05.zip b/sql/必须执行/yunze-iotapi--2024-05.zip new file mode 100644 index 0000000..bcdd68f Binary files /dev/null and b/sql/必须执行/yunze-iotapi--2024-05.zip differ diff --git a/yunze-admin/src/main/java/com/yunze/web/controller/yunze/card/AutoPollingController.java b/yunze-admin/src/main/java/com/yunze/web/controller/yunze/card/AutoPollingController.java index f65df41..1829171 100644 --- a/yunze-admin/src/main/java/com/yunze/web/controller/yunze/card/AutoPollingController.java +++ b/yunze-admin/src/main/java/com/yunze/web/controller/yunze/card/AutoPollingController.java @@ -28,7 +28,7 @@ public class AutoPollingController extends MyBaseController { @PostMapping(value = "/list", produces = { "application/json;charset=UTF-8" }) - @PreAuthorize("@ss.hasPermi('yunze:applyUseCard:list')") + @PreAuthorize("@ss.hasPermi('yunze:card:auto')") public String getList(@RequestBody String Pstr){ HashMap Parammap = new HashMap(); diff --git a/yunze-apiCommon/src/main/resources/mapper/yunze/YzCardRouteMapper.xml b/yunze-apiCommon/src/main/resources/mapper/yunze/YzCardRouteMapper.xml index cfdd059..638c75c 100644 --- a/yunze-apiCommon/src/main/resources/mapper/yunze/YzCardRouteMapper.xml +++ b/yunze-apiCommon/src/main/resources/mapper/yunze/YzCardRouteMapper.xml @@ -1,6 +1,6 @@ - + @@ -191,22 +191,24 @@ cd_control_type, cd_agent_id, cd_status, - msisdn as card_no, + msisdn AS card_no, network_type, + DATE_FORMAT( a.activate_date , "%Y-%m-%d" ) AS activateDate, + b.sms_host, b.sms_port, b.sms_source_addr, b.sms_shared_secret, b.sms_code, a.sms_number, + b.cd_name AS cdName, b.sms_src_TerminalId, - DATE_FORMAT( a.firstUseTime, "%Y-%m-%d %H:%i:%S" ) AS firstUseTime + DATE_FORMAT( a.firstUseTime, "%Y-%m-%d" ) AS firstUseTime FROM yz_card_route b, yz_card_info a - - cd_id = channel_id - AND iccid = #{iccid} + cd_id = channel_id + AND iccid =#{iccid} @@ -534,41 +536,25 @@ @@ -602,11 +588,12 @@ b.packet_valid_name AS validName, DATE_FORMAT(a.start_time, "%Y-%m-%d %H:%i:%S") AS startTime, DATE_FORMAT(a.end_time, "%Y-%m-%d %H:%i:%S") AS endTime, - a.status + a.STATUS, + b.error_flow FROM yz_card_flow a, yz_card_packet b - where a.iccid = #{iccid} - and a.packet_id = b.packet_id + WHERE a.iccid = #{iccid} + AND a.packet_id = b.packet_id ORDER BY start_time DESC LIMIT 1 @@ -724,7 +711,7 @@ GROUP BY channel_id ORDER BY - COUNT( 1 ) ASC + COUNT ( 1 ) ASC @@ -737,7 +724,7 @@ GROUP BY channel_id ORDER BY - COUNT( 1 ) ASC + COUNT ( 1 ) ASC @@ -750,7 +737,7 @@ GROUP BY channel_id ORDER BY - COUNT( 1 ) ASC + COUNT ( 1 ) ASC @@ -865,7 +852,14 @@ cd_id =#{channel_id} - + + + UPDATE + yz_card_route + + cd_count = 0 + + + @@ -910,7 +941,6 @@ - UPDATE yz_card_info @@ -924,40 +954,36 @@ - + update yz_busi_card_sms - state_id = #{state_id} + state_id = #{state_id} - msgid = #{msgid} + msgid = #{msgid} - - + select count(1) from yz_busi_card_sms - msgid = #{msgid} + msgid = #{msgid} - + INSERT INTO yz_busi_card_sms - ( - msgid, - msisdn, - content, - state_id, - type, - create_date, - del_flag, - sms_src_TerminalId - ) - value ( - #{msgid}, + (msgid, + msisdn, + content, + state_id, + type, + create_date, + del_flag, + sms_src_TerminalId) + value ( #{msgid}, #{msisdn}, , #{state_id}, @@ -968,4 +994,55 @@ ) + + + + + + + update yz_card_info + set used=#{used}, + remaining=#{remaining} + where iccid = #{iccid} + + diff --git a/yunze-web-ui/src/views/wechat/index.vue b/yunze-web-ui/src/views/wechat/index.vue index 1e421d6..779b8be 100644 --- a/yunze-web-ui/src/views/wechat/index.vue +++ b/yunze-web-ui/src/views/wechat/index.vue @@ -1,403 +1,455 @@ \ No newline at end of file +