tudc 4 years ago
parent
commit
8693b3c42c

+ 3 - 1
src/main/java/com/minpay/common/service/IReportService.java

@@ -8,6 +8,7 @@ import java.util.Map;
 
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 
+import com.startup.minpay.frame.core.IMINInitializer;
 import com.startup.minpay.frame.exception.MINBusinessException;
 import com.startup.minpay.frame.service.base.IMINLocalService;
 
@@ -16,7 +17,8 @@ import com.startup.minpay.frame.service.base.IMINLocalService;
  * @author 86159
  *
  */
-public interface IReportService extends IMINLocalService {
+public interface IReportService extends IMINLocalService, IMINInitializer {
 	public Map<String,Object> reportNeedDetail(Map<String, Object> param) throws MINBusinessException, ParseException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException,InvalidFormatException, IOException;
 	public Map<String, Object> reportTypeDDYZLFXB(String range, String reportTypeId, int page, int limit) throws MINBusinessException, ParseException, NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException;
+	public void reflush();
 }

+ 43 - 10
src/main/java/com/minpay/common/service/impl/ReportServiceImpl.java

@@ -69,16 +69,6 @@ public class ReportServiceImpl implements IReportService {
 	// 台区停电停电时长
 	static List<Map<String, String>> fenduanList = new ArrayList<Map<String, String>>();
 	static {
-		totalMap.put("xintai", "8382");
-		totalMap.put("daiyue", "4188");
-		totalMap.put("ningyang", "6292");
-		totalMap.put("taishan", "3784");
-		totalMap.put("dongping", "6212");
-		totalMap.put("feicheng", "6547");
-		totalMap.put("taishanjingqu", "1474");
-		totalMap.put("gaoxin", "1945");
-		totalMap.put("heji", "38824");
-		
 		//客户数
 		customerMap.put("xintai", "593100");
 		customerMap.put("daiyue", "323455");
@@ -131,6 +121,49 @@ public class ReportServiceImpl implements IReportService {
 		mapGT1440.put("desc", "24小时以上");
 		fenduanList.add(mapGT1440);
 	}
+	
+
+	@Override
+	public void init() throws MINBusinessException {
+		IMINDataBaseService db = Service.lookup(IMINDataBaseService.class);
+		PubAppparExample appparExample = new PubAppparExample();
+		appparExample.createCriteria().andCodeEqualTo("tqtd_num");
+		String hejiNum = "0";
+		try {
+			List<PubApppar> appparList = db.selectByExample(PubAppparMapper.class, appparExample);
+			for (PubApppar pub : appparList) {
+				if ("新泰".equals(pub.getValue())) {
+					totalMap.put("xintai", pub.getShowmsg());
+				} else if("岱岳".equals(pub.getValue())) {
+					totalMap.put("daiyue", pub.getShowmsg());
+				} else if("宁阳".equals(pub.getValue())) {
+					totalMap.put("ningyang", pub.getShowmsg());
+				} else if("泰山".equals(pub.getValue())) {
+					totalMap.put("taishan", pub.getShowmsg());
+				} else if("东平".equals(pub.getValue())) {
+					totalMap.put("dongping", pub.getShowmsg());
+				} else if("肥城".equals(pub.getValue())) {
+					totalMap.put("feicheng", pub.getShowmsg());
+				} else if("泰山景区".equals(pub.getValue())) {
+					totalMap.put("taishanjingqu", pub.getShowmsg());
+				} else if("高新".equals(pub.getValue())) {
+					totalMap.put("gaoxin", pub.getShowmsg());
+				}
+				hejiNum = CommonUtil.add(hejiNum, pub.getShowmsg());
+			}
+		} catch (MINBusinessException e) {
+			e.printStackTrace();
+		}
+		totalMap.put("heji", hejiNum);
+	}
+	
+	public void reflush() {
+		try {
+			init();
+		} catch (MINBusinessException e) {
+			e.printStackTrace();
+		}
+	}
 
 	
 	@Override

+ 59 - 0
src/main/java/com/minpay/reportManage/action/TQTDReportAction.java

@@ -13,14 +13,18 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 
 import com.minpay.common.format.IFormatService;
+import com.minpay.common.service.IReportService;
 import com.minpay.common.util.CommonUtil;
 import com.minpay.common.util.DateUtil;
 import com.minpay.common.util.ExportExcelUtil;
 import com.minpay.db.table.mapper.DwFileDetail00Mapper;
 import com.minpay.db.table.mapper.DwReportInfMapper;
+import com.minpay.db.table.mapper.PubAppparMapper;
 import com.minpay.db.table.model.DwFileDetail00;
 import com.minpay.db.table.model.DwFileDetail00Example;
 import com.minpay.db.table.model.DwReportInf;
+import com.minpay.db.table.model.PubApppar;
+import com.minpay.db.table.model.PubAppparExample;
 import com.minpay.db.table.own.mapper.ReportServiceMapper;
 import com.startup.minpay.frame.business.IMINAction;
 import com.startup.minpay.frame.business.res.MINActionResult;
@@ -44,6 +48,12 @@ public class TQTDReportAction implements IMINAction {
     /** 台区停电月报附件 */
     public final static String REPORT_INF_FUJIAN = "reportInfFujian";
     
+    /** 台区数量管理 */
+    public final static String AREA_NUM_MANAGE = "areaNumManage";
+    
+    /** 台区数量编辑 */
+    public final static String AREA_NUM_UPDATE = "areaNumUpdate";
+    
     
     /**
      * 台区停电穿透数据
@@ -287,4 +297,53 @@ public class TQTDReportAction implements IMINAction {
 		
     	return response;
     }
+    
+    /**
+     * 台区数量管理
+     * @param session
+     * @return
+     * @throws MINBusinessException
+     */
+    @MINAction(value = AREA_NUM_MANAGE)
+    public MINActionResult areaNumManage(
+        MINSession session
+    ) throws MINBusinessException {
+        MINActionResult res = new MINActionResult();
+        db = Service.lookup(IMINDataBaseService.class);
+        PubAppparExample appparExample = new PubAppparExample();
+		appparExample.createCriteria().andCodeEqualTo("tqtd_num");
+		List<PubApppar> appparList = db.selectByExample(PubAppparMapper.class, appparExample);
+		List<Map<String, String>> resList = new ArrayList<Map<String, String>>();
+		Map<String, String> resMap = new HashMap<String, String>();
+		resList.add(resMap);
+		String hejiNum = "0";
+		for (PubApppar pub : appparList) {
+			resMap.put(pub.getValue(), pub.getShowmsg());
+			hejiNum = CommonUtil.add(hejiNum, pub.getShowmsg());
+		}
+		resMap.put("合计", hejiNum);
+		res.set(IMINBusinessConstant.F_PAGING_LAY, resList);
+		return res;
+    }
+    
+    @MINAction(value = AREA_NUM_UPDATE)
+    public MINActionResult areaNumUpdate(
+    		@MINParam(key = "field") String field,
+    		@MINParam(key = "value") String value,
+    		MINSession session
+    		) throws MINBusinessException {
+    	MINActionResult res = new MINActionResult();
+    	// 修改数据库数据
+    	db = Service.lookup(IMINDataBaseService.class);
+    	PubApppar apppar = new PubApppar();
+    	apppar.setCode("tqtd_num");
+    	apppar.setValue(field);
+    	apppar.setShowmsg(value);
+    	db.updateByPrimaryKeySelective(PubAppparMapper.class, apppar);
+    	
+    	// 更新值
+    	Service.lookup(IReportService.class).reflush();
+    	
+    	return res;
+    }
 }

+ 6 - 6
src/main/webapp/WEB-INF/config.properties

@@ -1,11 +1,11 @@
 dataSource.driverClassName=com.mysql.jdbc.Driver
 
-dataSource.url=jdbc:mysql://123.138.111.28:3506/dianwang?useUnicode=true&characterEncoding=UTF8
-dataSource.username=dw_user
-dataSource.password=123456
-#dataSource.url=jdbc:mysql://127.0.0.1:3306/dianwang?useUnicode=true&characterEncoding=UTF8
-#dataSource.username=root
-#dataSource.password=12345
+#dataSource.url=jdbc:mysql://123.138.111.28:3506/dianwang?useUnicode=true&characterEncoding=UTF8
+#dataSource.username=dw_user
+#dataSource.password=123456
+dataSource.url=jdbc:mysql://127.0.0.1:3306/dianwang?useUnicode=true&characterEncoding=UTF8
+dataSource.username=root
+dataSource.password=12345
 
 
 config.MINDebug=false

+ 1 - 1
src/main/webapp/admin/reprotManage/dataWare.html

@@ -195,7 +195,7 @@
 				layer.open({
 				  type: 1,
 				  skin: 'layui-layer-rim', //加上边框
-				  area: ['500px', '400px'], //宽高
+				  area: ['600px', '400px'], //宽高
 				  content: '<form class="layui-form" style = "margin-top : 20px;">' +
 								'<div class="layui-inline" style = "margin-left : 20px;">' +
 									'<label class="f12-gray4">数据日期:</label>' +