Explorar o código

****************************************提交分类************************************

weixinVSjinlai %!s(int64=4) %!d(string=hai) anos
pai
achega
ba52552165

+ 14 - 3
datasyn/src/main/kotlin/com/persagy/server/syn/controllers/TestController.kt

@@ -32,6 +32,7 @@ import com.persagy.database.SFilter
 import com.persagy.mybatis.SMybatisDao
 import com.persagy.server.datacenter.models.entities.dictnew.DefFuncId
 import com.persagy.server.datacenter.wanda.dict.DictInfosWanDa
+import com.persagy.server.datacenter.wanda.obj.Equipment
 import com.persagy.server.syn.models.response.GroupResponse
 import com.persagy.server.syn.models.test.TestType
 import com.persagy.service.SObjectService
@@ -62,6 +63,11 @@ class TestController {
     private val defFuncIdService = SObjectService(SMybatisDao(DefFuncId::class.java))
     /** 对照表 */
     private val dictInfosWanDaService = SObjectService(SMybatisDao(DictInfosWanDa::class.java))
+    /**
+     * 设备服务
+     */
+    private val equipmentService = SObjectService(SMybatisDao(Equipment::class.java))
+
 
     // 注意获取这个实例
     @Autowired
@@ -87,10 +93,15 @@ class TestController {
      */
     @Operation(summary = "造对照表数据", description = "",tags = ["001"])
     @PostMapping(value = ["/test/analog/data"])
-    fun analogData(@RequestParam groupCode: String,@RequestBody testType: TestType): SBaseResponse{
-        logger.debug("数据= ${testType.toJson()}")
+    fun analogData(@RequestParam groupCode: String,@RequestParam projectId: String): SBaseResponse{
         try {
-            for (type in testType.types!!) {
+
+            val equipmentList = equipmentService.select(SFilter.eq("projectId", projectId)).exec()
+            var setCode = HashSet<String>()
+            for (equipment in equipmentList){
+                setCode.add(equipment.classCode!!)
+            }
+            for (type in setCode.toList()) {
                 val defFuncIdList = defFuncIdService.select(SFilter.eq("classCode", type), SFilter.eq("projectId", "Pj4403070003")).exec()
                 for (defFuncId in defFuncIdList){
                     if (!defFuncId.firstName.isNullOrEmpty()){