pipIrr-SV.git - Gitblit

			@@ -3,6 +3,7 @@
			import com.alibaba.fastjson2.JSON;
			import com.alibaba.fastjson2.JSONArray;
			import com.alibaba.fastjson2.JSONObject;
			import com.dy.common.multiDataSource.DataSourceContext;
			import com.dy.common.mw.protocol.Command;
			import com.dy.common.webUtil.QueryResultVo;
			import com.dy.pipIrrGlobal.command.ComSupport;
			@@ -23,9 +24,10 @@
			import lombok.RequiredArgsConstructor;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.dubbo.common.utils.PojoUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.core.env.Environment;
			import org.springframework.stereotype.Service;

			import java.time.format.DateTimeFormatter;
			import java.util.ArrayList;
			import java.util.HashMap;
			import java.util.List;
			@@ -48,6 +50,25 @@
			private final PrWaterPriceMapper prWaterPriceMapper;
			private final PrIntakeVcMapper prIntakeVcMapper;
			private final SeClientCardMapper seClientCardMapper;

			/**
			* pro_mw：属性
			* tag从控制器中获取
			* key_mw：url的key
			*/
			private Environment env = null;
			private String pro_mw = "mw";
			private String key_mw = "comSendUrl";
			@Autowired
			public CommandSv(RmCommandHistoryMapper rmCommandHistoryMapper, SeVirtualCardMapper seVirtualCardMapper, PrIntakeMapper prIntakeMapper, PrWaterPriceMapper prWaterPriceMapper, PrIntakeVcMapper prIntakeVcMapper, SeClientCardMapper seClientCardMapper, Environment env) {
			this.rmCommandHistoryMapper = rmCommandHistoryMapper;
			this.seVirtualCardMapper = seVirtualCardMapper;
			this.prIntakeMapper = prIntakeMapper;
			this.prWaterPriceMapper = prWaterPriceMapper;
			this.prIntakeVcMapper = prIntakeVcMapper;
			this.seClientCardMapper = seClientCardMapper;
			this.env = env;
			}

			/**
			* 虚拟卡ID换虚拟卡对象
			@@ -73,7 +94,7 @@
			*/
			public Long insert(RmCommandHistory po) {
			rmCommandHistoryMapper.insert(po);
			return po.getId();
			return po.getComId();
			}

			/**
			@@ -95,9 +116,9 @@
			com.id = Command.defaultId;
			com.code = "LCD0001";
			com.type = "innerCommand";
			comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);

			JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));

			if(response != null && response.getString("code").equals("0001")) {
			JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
			HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class);
			@@ -151,9 +172,9 @@
			com.id = Command.defaultId;
			com.code = "LCD0001";
			com.type = "innerCommand";
			comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);

			JSONObject response = (JSONObject) JSON.toJSON(sendCom2Mw(com));

			if(response != null && response.getString("code").equals("0001")) {
			JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
			HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class);
			@@ -190,7 +211,6 @@
			* @return
			*/
			public QueryResultVo<List<VoCommand>> getCommandHistories(QoCommand query) {
			DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
			// 完善查询起止时间
			String timeStart = query.getTimeStart();
			String timeStop = query.getTimeStop();