From 16b961c2210fe29fd494ac1f9d830dd93503961f Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 02 八月 2024 17:25:17 +0800
Subject: [PATCH] 1. 新增监测设备的管理功能
---
src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ProblemlistServiceImpl.kt | 188 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 136 insertions(+), 52 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ProblemlistServiceImpl.kt b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ProblemlistServiceImpl.kt
index a56fe6a..8f2b7d4 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ProblemlistServiceImpl.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/lightshare/service/impl/ProblemlistServiceImpl.kt
@@ -1,18 +1,26 @@
package cn.flightfeather.supervision.lightshare.service.impl
+import cn.flightfeather.supervision.common.exception.BizException
+import cn.flightfeather.supervision.common.log.BizLog
+import cn.flightfeather.supervision.common.log.WorkStreamLogInfo
import cn.flightfeather.supervision.domain.ds1.entity.Problemlist
import cn.flightfeather.supervision.domain.ds1.entity.Scense
import cn.flightfeather.supervision.common.utils.Constant
import cn.flightfeather.supervision.common.utils.FileUtil
import cn.flightfeather.supervision.common.utils.UUIDGenerator
import cn.flightfeather.supervision.domain.ds1.entity.Mediafile
+import cn.flightfeather.supervision.domain.ds1.entity.Subtask
import cn.flightfeather.supervision.domain.ds1.mapper.*
+import cn.flightfeather.supervision.domain.ds1.repository.ProblemRep
+import cn.flightfeather.supervision.domain.ds1.repository.SubTaskRep
+import cn.flightfeather.supervision.domain.ds1.repository.TaskRep
import cn.flightfeather.supervision.lightshare.service.MediafileService
import cn.flightfeather.supervision.lightshare.service.ProblemlistService
import cn.flightfeather.supervision.lightshare.service.TaskService
import cn.flightfeather.supervision.lightshare.vo.*
import com.fasterxml.jackson.core.type.TypeReference
import com.fasterxml.jackson.databind.ObjectMapper
+import com.github.pagehelper.PageHelper
import org.springframework.beans.BeanUtils
import org.springframework.stereotype.Service
import org.springframework.web.multipart.MultipartFile
@@ -32,17 +40,25 @@
class ProblemlistServiceImpl(
val problemlistMapper: ProblemlistMapper,
val inspectionMapper: InspectionMapper,
- val mediafileMapper: MediafileMapper
+ val mediafileMapper: MediafileMapper,
+ private val taskRep: TaskRep,
+ private val subTaskRep: SubTaskRep,
+ private val problemRep: ProblemRep,
+ private val bizLog: BizLog,
) : ProblemlistService {
@Resource
lateinit var scenseMapper: ScenseMapper
+
@Resource
lateinit var problemtypeMapper: ProblemtypeMapper
+
@Resource
lateinit var taskMapper: TaskMapper
+
@Resource
lateinit var taskService: TaskService
+
@Resource
lateinit var mediafileService: MediafileService
@@ -116,26 +132,9 @@
override fun getStatisticalResult(areaVo: AreaVo): List<StatisticsVo> {
val districtcode = areaVo.districtcode
val sceneType = areaVo.scensetypeid
- val startTime = areaVo.starttime
- val endTime = areaVo.endtime
- val maps = problemlistMapper.getStatisticalResult(districtcode,startTime, endTime, sceneType)
- val statisticsVos = mutableListOf<StatisticsVo>()
- maps.forEach {
- if (!it.isEmpty() && it.get("name") != null) {
- val statisticsVo = StatisticsVo()
- statisticsVo.name = it.get("name").toString()
- try {
- statisticsVo.count = it.get("count").toString().toInt()
- } catch (e: Exception) {
- }
- try {
- statisticsVo.changeCount = it.get("changeCount").toString().toInt()
- } catch (e: Exception) {
- }
- statisticsVos.add(statisticsVo)
- }
- }
- return statisticsVos
+ val startTime = areaVo.starttime?.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
+ val endTime = areaVo.endtime?.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
+ return problemlistMapper.getStatisticalResult(districtcode, startTime, endTime, sceneType, areaVo.sceneId)
}
override fun getChargeResult(areaVo: AreaVo): ChargeInfoVo {
@@ -146,7 +145,12 @@
// .andGreaterThanOrEqualTo("endtime", areaVo.endtime)
// .andEqualTo("districtcode", areaVo.districtcode)
val chargeInfoVo = ChargeInfoVo()
- val sql = "select T_GUID, T_Name from tm_t_task where TS_GUID IS NULL and T_StartTime <= '" + areaVo.starttime + "' and T_EndTime >= '" + areaVo.endtime + "' and T_DistrictCode = '" + areaVo.districtcode +"'"
+ val sTime = areaVo.starttime?.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
+ val eTime = areaVo.endtime?.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
+ val sql =
+ "select T_GUID, T_Name from tm_t_task where TS_GUID IS NULL and T_StartTime <= '" + sTime + "' and T_EndTime" +
+ " >= '" + eTime + "' and T_DistrictCode = '" + areaVo.districtcode + "'"
+
val maps1 = taskMapper.selectSE(sql)
var topTaskId = String()
var topTaskName = String()
@@ -167,7 +171,7 @@
} catch (e: Exception) {
}
try {
- sceneInfo.changeCount =it.get("changeCount").toString().toInt()
+ sceneInfo.changeCount = it.get("changeCount").toString().toInt()
} catch (e: Exception) {
}
chargeInfoVo.sceneInfos.add(sceneInfo)
@@ -186,16 +190,16 @@
var curScore = -1
if (it.get("scoreAft") != null) {
curScore = it.get("scoreAft").toString().toInt()
- }else if (it.get("scoreBef") != null) {
+ } else if (it.get("scoreBef") != null) {
curScore = it.get("scoreBef").toString().toInt()
}
if (curScore >= 100) {
scoreInfo1.count++
- }else if (curScore >= 78 && curScore < 100) {
+ } else if (curScore >= 78 && curScore < 100) {
scoreInfo2.count++
- }else if (curScore >= 54 && curScore < 78) {
+ } else if (curScore >= 54 && curScore < 78) {
scoreInfo3.count++
- }else if (curScore < 54 && curScore >= 0) {
+ } else if (curScore < 54 && curScore >= 0) {
scoreInfo4.count++
}
}
@@ -209,7 +213,7 @@
}
//鏍规嵁鍦板煙鑾峰彇闂
- override fun getByArea(areaVo: AreaVo):List<ProblemlistVo> {
+ override fun getByArea(areaVo: AreaVo): List<ProblemlistVo> {
val problemlist = mutableListOf<ProblemlistVo>()
// val tmpproblemlsit = mutableListOf<Problemlist>()
val example = Example(Scense::class.java)
@@ -225,8 +229,8 @@
criteria.andEqualTo("towncode", areaVo.towncode)
criteria.andEqualTo("typeid", areaVo.scensetypeid)
val result1 = scenseMapper.selectByExample(example)
- if (result1.isNotEmpty()){
- result1.forEach{
+ if (result1.isNotEmpty()) {
+ result1.forEach {
val tmpexample = Example(Problemlist::class.java)
val tmpcriteria = tmpexample.createCriteria()
//瀵逛簬纭畾鐨勬瘡涓満鏅紝鏍规嵁鏃堕棿鏌ヨ闂
@@ -340,74 +344,99 @@
override fun findMonthProblemById(taskId: String, sceneId: Int?): List<MonthProblemVo> {
val monthProblemlistVoList = mutableListOf<MonthProblemVo>()
- var map = problemlistMapper.findMonthProblemById(taskId,sceneId)
+ var map = problemlistMapper.findMonthProblemById(taskId, sceneId)
map.forEach { m ->
val monthProblemVo = MonthProblemVo()
- monthProblemVo.townCode =if(m.get("towncode")!= null) BigDecimal(m.get("towncode").toString()).toString() else null
+ monthProblemVo.townCode =
+ if (m.get("towncode") != null) BigDecimal(m.get("towncode").toString()).toString() else null
monthProblemVo.townName = if (m.get("townname") != null) m.get("townname").toString() else null
- monthProblemVo.scenetype =if (m.get("scenetype") != null) m.get("scenetype").toString().toInt()else null
- monthProblemVo.scenetypename =if(m.get("scenetypename") != null)m.get("scenetypename").toString()else null
- monthProblemVo.totalscenecount =if(m.get("totalscenecount") != null)m.get("totalscenecount").toString().toInt()else null
- monthProblemVo.problemscenes =if(m.get("problemscenes") != null)m.get("problemscenes").toString().toInt()else null
- monthProblemVo.totalproblems =if(m.get("totalproblems") != null)m.get("totalproblems").toString().toInt()else null
- monthProblemVo.changedproblems =if(m.get("changedproblems") != null)m.get("changedproblems").toString().toInt()else null
+ monthProblemVo.scenetype = if (m.get("scenetype") != null) m.get("scenetype").toString().toInt() else null
+ monthProblemVo.scenetypename =
+ if (m.get("scenetypename") != null) m.get("scenetypename").toString() else null
+ monthProblemVo.totalscenecount =
+ if (m.get("totalscenecount") != null) m.get("totalscenecount").toString().toInt() else null
+ monthProblemVo.problemscenes =
+ if (m.get("problemscenes") != null) m.get("problemscenes").toString().toInt() else null
+ monthProblemVo.totalproblems =
+ if (m.get("totalproblems") != null) m.get("totalproblems").toString().toInt() else null
+ monthProblemVo.changedproblems =
+ if (m.get("changedproblems") != null) m.get("changedproblems").toString().toInt() else null
monthProblemlistVoList.add(monthProblemVo)
}
return monthProblemlistVoList;
}
- override fun check(pId: String, action: Byte, remark: String, userId: String, userName: String): BaseResponse<String> {
+ override fun check(
+ pId: String,
+ action: Byte,
+ remark: String,
+ userId: String,
+ userName: String,
+ ): BaseResponse<String> {
if (action !in 0..3) {
return BaseResponse(false, "闈炴硶鐨勬搷浣滄寚浠�")
}
val p = problemlistMapper.selectByPrimaryKey(pId) ?: return BaseResponse(false, "闂涓嶅瓨鍦�")
+ val subtask = p.stguid?.let { subTaskRep.findOne(it) }
val response = BaseResponse<String>(true)
+ var event = ""
p.apply {
this.remark = userName
if (extension3 == Constant.PROBLEM_UNCHECKED) {
+ event = "鍦�${subtask?.scensename}瀹℃牳浜嗕竴涓棶棰�"
when (action) {
- 0.toByte() -> extension3 = Constant.PROBLEM_CHECK_PASS
- 1.toByte() -> extension3 = Constant.PROBLEM_CHECK_FAIL
+ 0.toByte() -> {
+ extension3 = Constant.PROBLEM_CHECK_PASS
+ }
+ 1.toByte() -> {
+ extension3 = Constant.PROBLEM_CHECK_FAIL
+ }
2.toByte(),
- 3.toByte() -> {
+ 3.toByte(),
+ -> {
response.success = false
response.message = "闂鎻愪氦杩樻湭瀹℃牳锛屾棤娉曡繘琛屾暣鏀瑰鏍革紒"
}
}
- }else if (extension3 == Constant.PROBLEM_CHECK_PASS || extension3 == Constant.PROBLEM_CHECK_FAIL) {
+ } else if (extension3 == Constant.PROBLEM_CHECK_PASS || extension3 == Constant.PROBLEM_CHECK_FAIL) {
when (action) {
0.toByte() -> extension3 = Constant.PROBLEM_CHECK_PASS
1.toByte() -> extension3 = Constant.PROBLEM_CHECK_FAIL
2.toByte(),
- 3.toByte() -> {
+ 3.toByte(),
+ -> {
if (ischanged == true && extension3 == Constant.PROBLEM_CHECK_PASS) {
response.success = true
extension3 = if (action == 2.toByte()) {
Constant.CHANGE_CHECK_PASS
- }else{
+ } else {
Constant.CHANGE_CHECK_FAIL
}
+ event = "鍦�${subtask?.scensename}瀹℃牳浜嗕竴涓暣鏀�"
} else {
response.success = false
response.message = "闂杩樻湭鏁存敼锛屾棤娉曡繘琛屾暣鏀瑰鏍革紒鎿嶄綔鏃犳晥"
}
}
}
- }else if (extension3 == Constant.CHANGE_UNCHECKED) {
+ } else if (extension3 == Constant.CHANGE_UNCHECKED) {
+ event = "鍦�${subtask?.scensename}瀹℃牳浜嗕竴涓暣鏀�"
when (action) {
0.toByte(),
- 1.toByte() -> {
+ 1.toByte(),
+ -> {
response.success = false
response.message = "闂鎻愪氦宸插鏍革紝骞朵笖宸茶鏁存敼銆傛搷浣滄棤鏁�"
}
2.toByte() -> extension3 = Constant.CHANGE_CHECK_PASS
3.toByte() -> extension3 = Constant.CHANGE_CHECK_FAIL
}
- }else if (extension3 == Constant.CHANGE_CHECK_PASS || extension3 == Constant.CHANGE_CHECK_FAIL) {
+ } else if (extension3 == Constant.CHANGE_CHECK_PASS || extension3 == Constant.CHANGE_CHECK_FAIL) {
when (action) {
0.toByte(),
- 1.toByte() -> {
+ 1.toByte(),
+ -> {
response.success = false
response.message = "闂鎻愪氦宸插鏍革紝骞朵笖宸茶鏁存敼銆傛搷浣滄棤鏁�"
}
@@ -422,6 +451,8 @@
if (r != 1) {
response.success = false
response.message = "闂鏇存柊澶辫触锛�"
+ } else {
+ bizLog.info(WorkStreamLogInfo(userId, userName, event))
}
}
return response
@@ -471,11 +502,14 @@
filetype = 1
businesstype = "闂"
businesstypeid = 1
- path = "FlightFeather/Photo/" + scene.districtname + "/" + now.year + "骞�" + now.monthValue + "鏈�/" + now.monthValue + "鏈�" + now.dayOfMonth + "鏃�/" + scene.name + "/"
- description = problemlist.problemname + " " + problemlist.location + " " + UUIDGenerator.generateUUID(4) + ".jpg"
+ path =
+ "FlightFeather/Photo/" + scene.districtname + "/" + now.year + "骞�" + now.monthValue + "鏈�/" + now.monthValue + "鏈�" + now.dayOfMonth + "鏃�/" + scene.name + "/"
+ description =
+ problemlist.problemname + " " + problemlist.location + " " + UUIDGenerator.generateUUID(4) + ".jpg"
savetime = Date()
ischanged = false
- extension1 = scene.citycode + "/" + scene.districtcode + "/" + now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + "/" + scene.guid + "/"
+ extension1 =
+ scene.citycode + "/" + scene.districtcode + "/" + now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + "/" + scene.guid + "/"
remark = "宸蹭笂浼�"
}
mediafileMapper.insert(mediaFile)
@@ -496,6 +530,12 @@
if (inspection.problemcount != null) {
inspection.problemcount = inspection.problemcount!! + 1
inspectionMapper.updateByPrimaryKey(inspection)
+ }
+
+ problemlist.stguid?.let {
+ val subtask = subTaskRep.findOne(it)
+ val event = "鍦�${subtask?.scensename}鏂板涓�涓棶棰�"
+ bizLog.info(WorkStreamLogInfo(subtask?.executorguids, subtask?.executorrealtimes, event))
}
return BaseResponse(true)
@@ -556,4 +596,48 @@
return BaseResponse(true)
}
+
+ override fun getBySubTask(stGuid: String, all: Boolean?): List<ProblemlistVo> {
+ //鏍规嵁瀛愪换鍔D鑾峰彇闂鍒楄〃
+ val problemListVo = mutableListOf<ProblemlistVo>()
+ if (all == false) {
+ //鍘婚櫎鏈鏍镐互鍙婂鏍镐笉閫氳繃鐨勯棶棰�
+ findBySubtaskId(stGuid).forEach {
+ if (it.extension3 != Constant.PROBLEM_UNCHECKED && it.extension3 != Constant.PROBLEM_CHECK_FAIL) {
+ problemListVo.add(it)
+ }
+ }
+ } else {
+ problemListVo.addAll(findBySubtaskId(stGuid))
+ }
+ //鏍规嵁姣忎釜闂,鑾峰彇濯掍綋鏂囦欢
+ problemListVo.forEach {
+ val mediafileVo = mediafileService.findByBusinessGUID(it.guid!!)
+ //鍒ゆ柇鏄惁鏈夊獟浣撹祫鏂�
+ if (mediafileVo.isNotEmpty()) {
+ //璧嬪��
+ it.mediafileList = mediafileVo
+ }
+ }
+ return problemListVo
+ }
+
+ override fun getSceneByProType(areaVo: AreaVo, pType: String): List<Subtask?> {
+ areaVo.scensetypeid ?: throw BizException("缂哄皯鍦烘櫙绫诲瀷鍙傛暟")
+ val task = taskRep.findOneTask(areaVo) ?: throw BizException("鏈壘鍒板搴旂殑宸℃煡鎬讳换鍔�")
+ return subTaskRep.findSubtasks(task.tguid!!, areaVo.scensetypeid!!, pType)
+ }
+
+ override fun getSceneProSummary(
+ areaVo: AreaVo,
+ sortBy: String,
+ page: Int,
+ per_page: Int,
+ ): Pair<DataHead?, List<SceneProblemSummary>?> {
+ areaVo.scensetypeid ?: throw BizException("缂哄皯鍦烘櫙绫诲瀷鍙傛暟")
+ val task = taskRep.findOneTask(areaVo) ?: throw BizException("鏈壘鍒板搴旂殑宸℃煡鎬讳换鍔�")
+ val p = PageHelper.startPage<SceneProblemSummary>(page, per_page)
+ val res = problemRep.getSceneProSummary(task.tguid!!, areaVo.scensetypeid!!, areaVo.sort, sortBy)
+ return DataHead(p.pageNum, p.pages, p.total) to res
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3