bug fix

src/main/java/org/springblade/common/utils/FileUploadUtil.java

@@ -59,7 +59,11 @@ public class FileUploadUtil {
 
 		//完成文件上传
 		try {
-			file.transferTo(new File(FILE_SAVE_PATH + dirPath + "/" + fileName));
+			String fullPath = FILE_SAVE_PATH + dirPath + "/" + fileName;
+			String command = "chmod 644 " + fullPath;
+			Runtime runtime = Runtime.getRuntime();
+			file.transferTo(new File(fullPath));
+			Process proc = runtime.exec(command);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

src/main/java/org/springblade/modules/business/controller/AppealMediateController.java

@@ -91,6 +91,17 @@ public class AppealMediateController extends BladeController {
 		return R.data(mediationService.detail(mediateId));
 	}
 
+	/**
+	 * 根据诉求id获取最新的调解记录
+	 *
+	 * @param appealId 诉求ID
+	 * @return
+	 */
+	@GetMapping("/getLastMediation")
+	public R getLastMediation(String appealId) {
+		return R.data(mediationService.getLastMediation(appealId));
+	}
+
 	/**
 	 * 根据调解记录id获取详情, 获取 诉求信息, 本次调解记录(参数id指定的调解记录), 所有调解访谈记录列表(带id)
 	 *

src/main/java/org/springblade/modules/business/controller/ReportController.java

@@ -54,6 +54,14 @@ public class ReportController extends BladeController {
 
 	private final ILargeScreenService largeScreenService;
 
+	/**
+	 * 矛盾纠纷上报统计(中1)
+	 */
+	@GetMapping("/getAppealSubmit")
+	public R getAppealSubmit() {
+		return R.data(largeScreenService.getAppealSubmit());
+	}
+
 	/**
 	 * 矛盾纠纷化解统计(左1)
 	 */
@@ -66,7 +74,7 @@ public class ReportController extends BladeController {
 	 * 矛盾纠纷上报处理列表(左2)
 	 */
 	@GetMapping("/getAppealList")
-	public R getAppealList() {
+	public R getAppealList(Integer timeFrame, String startTime, String endTime) {
 		return R.data(largeScreenService.getAppealList());
 	}
 
@@ -74,7 +82,7 @@ public class ReportController extends BladeController {
 	 * 矛盾纠纷月份趋势统计(左3)
 	 */
 	@GetMapping("/getAppealByMon")
-	public R getAppealByMon() {
+	public R getAppealByMon(Integer timeFrame, String startTime, String endTime) {
 		return R.data(largeScreenService.getAppealByMon());
 	}
 
@@ -82,18 +90,10 @@ public class ReportController extends BladeController {
 	 * 矛盾纠纷类型占比统计(左4)
 	 */
 	@GetMapping("/getAppealTypePercent")
-	public R getAppealTypePercent() {
+	public R getAppealTypePercent(Integer timeFrame, String startTime, String endTime) {
 		return R.data(largeScreenService.getAppealTypePercent());
 	}
 
-	/**
-	 * 矛盾纠纷上报统计(中1)
-	 */
-	@GetMapping("/getAppealSubmit")
-	public R getAppealSubmit() {
-		return R.data(largeScreenService.getAppealSubmit());
-	}
-
 	/**
 	 * 事件上报热力图(中2)
 	 */
@@ -125,7 +125,7 @@ public class ReportController extends BladeController {
 	 * 越级上报事件列表(中5)
 	 */
 	@GetMapping("/getImmediateList")
-	public R getImmediateList(String streetId, Query query) {
+	public R getImmediateList(String streetId, Integer timeFrame, String startTime, String endTime, Query query) {
 		return R.data(largeScreenService.getImmediateList(streetId, Condition.getPage(query)));
 	}
 
@@ -133,7 +133,7 @@ public class ReportController extends BladeController {
 	 * 矛盾纠纷化解排行（街道/部门）统计(右1-2)
 	 */
 	@GetMapping("/getAppealHot")
-	public R getAppealHot() {
+	public R getAppealHot(Integer timeFrame, String startTime, String endTime) {
 		return R.data(largeScreenService.getAppealHot());
 	}
 

src/main/java/org/springblade/modules/business/entity/Appeal.java

@@ -70,6 +70,10 @@ public class Appeal extends BaseEntity {
 	 * 是否越级上报, 0:否, 1:是
 	 */
 	private Integer skipGrant;
+	/**
+	 * 越级等级, 0:中央, 1:省级, 2:市级, 3:区县
+	 */
+	private Integer skipGrantLevel;
 	/**
 	 * 数据来源 0:系统添加, 1:数据导入
 	 */

src/main/java/org/springblade/modules/business/entity/AppealMediation.java

@@ -26,6 +26,7 @@ import java.util.Date;
 
 /**
  * 诉求调解表
+ *
  * @author Chill
  */
 
@@ -84,5 +85,8 @@ public class AppealMediation extends BaseEntity {
 	 * 提交时间
 	 */
 	private Date submitTime;
-
+	/**
+	 * 调解员姓名
+	 */
+	private Long mediatorName;
 }

src/main/java/org/springblade/modules/business/service/IAppealMediationService.java

@@ -45,6 +45,14 @@ public interface IAppealMediationService extends BaseService<AppealMediation> {
 	 */
 	AppealMediationVO detail(String mediateId);
 
+	/**
+	 * 根据诉求id获取最新的调解记录
+	 *
+	 * @param appealId 诉求ID
+	 * @return
+	 */
+	AppealMediationVO getLastMediation(String appealId);
+
 	/**
 	 * 根据调解记录id获取详情, 获取 诉求信息, 本次调解记录(参数id指定的调解记录), 所有调解访谈记录列表(带id)
 	 *

src/main/java/org/springblade/modules/business/service/impl/AppealMediationServiceImpl.java

@@ -31,6 +31,7 @@ import org.springblade.modules.business.vo.AppealMediationDetailListVO;
 import org.springblade.modules.business.vo.AppealMediationVO;
 import org.springframework.stereotype.Service;
 
+import java.sql.Wrapper;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -61,6 +62,19 @@ public class AppealMediationServiceImpl extends BaseServiceImpl<AppealMediationM
 		return getMediationDetail(mediation.getAppealId().toString(), mediateId);
 	}
 
+	@Override
+	public AppealMediationVO getLastMediation(String appealId) {
+		// 取最后一次调解记录
+		List<AppealMediation> mediationList = baseMapper.selectList(Wrappers.<AppealMediation>lambdaQuery().eq(AppealMediation::getAppealId, appealId));
+
+		if (Func.isNotEmpty(mediationList) && mediationList.size() > 0) {
+			Long mediateId = mediationList.get(mediationList.size() - 1).getId();
+			return getMediationDetail(appealId, mediateId.toString());
+		}
+
+		return null;
+	}
+
 	@Override
 	public boolean saveMediate(AppealMediationVO entity) {
 		// 解析保存数据, 构建保存对象
@@ -122,7 +136,7 @@ public class AppealMediationServiceImpl extends BaseServiceImpl<AppealMediationM
 			detailList.add(listVO);
 		});
 
-		// 若未指定调解记录, 取最后一次, 否则取指定的调解记录
+		// 取指定的调解记录
 		AppealMediation mediation = null;
 		if (Func.isNotBlank(mediationId)) {
 			mediation = mediationList.stream().filter(o -> o.getId() == Long.parseLong(mediationId)).findAny().orElse(null);

src/main/java/org/springblade/modules/business/vo/AppealMediationVO.java

@@ -113,6 +113,10 @@ public class AppealMediationVO implements Serializable {
 	 * 是否越级上报, 0:否, 1:是
 	 */
 	private Integer skipGrant;
+	/**
+	 * 越级等级, 0:中央, 1:省级, 2:市级, 3:区县
+	 */
+	private Integer skipGrantLevel;
 
 	/**
 	 * 反应问题
@@ -161,11 +165,15 @@ public class AppealMediationVO implements Serializable {
 	 */
 	private String remark;
 
-
 	/**
 	 * 提交时间
 	 */
 	private Date submitTime;
 
+	/**
+	 * 调解员姓名
+	 */
+	private Long mediatorName;
+
 	private List<AppealMediationFile> fileList;
 }

src/main/resources/application-dev.yml

@@ -20,13 +20,13 @@ spring:
 #spring:
 #  redis:
 #    ##redis 单机环境配置
-#    host: 127.0.0.1
+#    host: 223.80.105.200
-#    port: 6379
+#    port: 41307
-#    password:
+#    password: asdf.1234
 #    database: 0
 #    ssl: false
 #  datasource:
 #    # MySql
-#    url: jdbc:mysql://localhost:3306/mediation_platform?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+#    url: jdbc:mysql://223.80.105.200:41306/mediation_platform?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
 #    username: root
-#    password: 123456
+#    password: asdf.1234