From a14169f2a546ce8041d4205c871b55a7ce0e84c7 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Tue, 20 Aug 2024 08:44:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=BE=E5=A4=87=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bigmodel/maintenance/entity/ControlEntity.java | 57 +++++++++++++++++ .../bigmodel/configuration/BigModelInvokeApi.java | 6 ++ .../interactive/service/IHznlmInvokeService.java | 6 ++ .../service/impl/HznlmInvokeServiceImpl.java | 7 ++ .../maintenance/controller/ControlController.java | 74 ++++++++++++++++++++++ .../bigmodel/maintenance/mapper/ControlMapper.java | 12 ++++ .../maintenance/service/ControlService.java | 21 ++++++ .../src/main/resources/template/template.yml | 1 + 8 files changed, 184 insertions(+) create mode 100644 hzims-service-api/big-model-api/src/main/java/com/hnac/hzims/bigmodel/maintenance/entity/ControlEntity.java create mode 100644 hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/maintenance/controller/ControlController.java create mode 100644 hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/maintenance/mapper/ControlMapper.java create mode 100644 hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/maintenance/service/ControlService.java diff --git a/hzims-service-api/big-model-api/src/main/java/com/hnac/hzims/bigmodel/maintenance/entity/ControlEntity.java b/hzims-service-api/big-model-api/src/main/java/com/hnac/hzims/bigmodel/maintenance/entity/ControlEntity.java new file mode 100644 index 0000000..3c0ea70 --- /dev/null +++ b/hzims-service-api/big-model-api/src/main/java/com/hnac/hzims/bigmodel/maintenance/entity/ControlEntity.java @@ -0,0 +1,57 @@ +package com.hnac.hzims.bigmodel.maintenance.entity; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.SqlCondition; +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.support.QueryField; +import org.springblade.core.tenant.mp.TenantEntity; + +import java.io.Serializable; + +/** + * @Author: huangxing + * @Date: 2024/08/19 18:33 + */ +@Data +@EqualsAndHashCode +@ApiModel("设备控制实体类") +public class ControlEntity extends TenantEntity implements Serializable { + + @ApiModelProperty(value = "itemId",required = true) + private String itemId; + + @ApiModelProperty(value = "站点名称",required = true) + @QueryField(condition = SqlCondition.LIKE) + private String stationName; + + @ApiModelProperty(value = "站点ID") + @QueryField(condition = SqlCondition.EQUAL) + private String stationId; + + @ApiModelProperty(value = "遥控的设备名称") + @QueryField(condition = SqlCondition.LIKE) + private String deviceName; + + @ApiModelProperty(value = "遥控的设备ID") + @QueryField(condition = SqlCondition.EQUAL) + private String deviceId; + + @TableField("yk_name") + @JSONField(name = "yk_name") + @ApiModelProperty(value = "遥控名称(不包含站点)",required = true) + @QueryField(condition = SqlCondition.LIKE) + private String remoteName; + + @ApiModelProperty(value = "用于展示和匹配的全称，一般可设为 站点名称-遥控名称",required = true) + @QueryField(condition = SqlCondition.LIKE) + private String itemName; + + @ApiModelProperty(value = "类型，可为平台、业务",required = true) + @QueryField(condition = SqlCondition.LIKE) + private String type; + +} diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/configuration/BigModelInvokeApi.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/configuration/BigModelInvokeApi.java index d6365af..c11b4b6 100644 --- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/configuration/BigModelInvokeApi.java +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/configuration/BigModelInvokeApi.java @@ -56,4 +56,10 @@ public class BigModelInvokeApi { * 起数据分析问答 */ private String assistantAnalyseAsk; + + /** + * 更新数据 + */ + private String updateKnowledge; + } diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/IHznlmInvokeService.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/IHznlmInvokeService.java index 1833f09..51ed3f3 100644 --- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/IHznlmInvokeService.java +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/IHznlmInvokeService.java @@ -87,4 +87,10 @@ public interface IHznlmInvokeService { */ void smartReportGeneratePower(RunReportAnalyseRequest req); + /** + * 更新数据 + * @param name 数据名 + */ + void updateKnowledge(String name); + } diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/HznlmInvokeServiceImpl.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/HznlmInvokeServiceImpl.java index 90074ba..b8bdb15 100644 --- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/HznlmInvokeServiceImpl.java +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/service/impl/HznlmInvokeServiceImpl.java @@ -145,6 +145,13 @@ public class HznlmInvokeServiceImpl implements IHznlmInvokeService { } @Override + public void updateKnowledge(String name) { + Map params = new HashMap<>(); + params.put("name",name); + RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getUpdateKnowledge(), params); + } + + @Override public List hotQuestions() { try { return RequestClientUtil.postCall(gglmUrl + bigModelInvokeApi.getHotQuestion(), null, new TypeReference>(){}); diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/maintenance/controller/ControlController.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/maintenance/controller/ControlController.java new file mode 100644 index 0000000..17f18bc --- /dev/null +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/maintenance/controller/ControlController.java @@ -0,0 +1,74 @@ +package com.hnac.hzims.bigmodel.maintenance.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.hnac.hzims.bigmodel.interactive.service.IHznlmInvokeService; +import com.hnac.hzims.bigmodel.maintenance.entity.ControlEntity; +import com.hnac.hzims.bigmodel.maintenance.entity.DatasourceEntity; +import com.hnac.hzims.bigmodel.maintenance.service.ControlService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; + +/** + * @Author: huangxing + * @Date: 2024/08/19 18:50 + */ +@RestController +@RequestMapping("/control") +@Api(tags = "设备控制指令管理",value = "设备控制指令管理") +@AllArgsConstructor +public class ControlController { + + private final ControlService service; + private final IHznlmInvokeService invokeService; + + @GetMapping("/listPage") + @ApiOperation(value = "分页查询") + @ApiOperationSupport(order = 1) + public R> listPage(Query query, ControlEntity req) { + return R.data(service.page(Condition.getPage(query),Condition.getQueryWrapper(req).lambda())); + } + + @GetMapping("/detail") + @ApiOperation(value = "查看详情") + @ApiOperationSupport(order = 2) + public R detail(@RequestParam @ApiParam("主键ID") Long id) { + return R.data(service.getById(id)); + } + + @PostMapping("/save") + @ApiOperation(value = "保存设备控制指令配置") + @ApiOperationSupport(order = 3) + public R save(@RequestBody ControlEntity req) { + return R.status(service.save(req)); + } + + @DeleteMapping("/remove") + @ApiOperation(value = "删除设备控制指令配置") + @ApiOperationSupport(order = 4) + public R remove(@RequestParam @ApiParam("主键ID,按逗号分隔") String ids) { + return R.status(service.removeByIds(Func.toLongList(",",ids))); + } + + @PutMapping("/updateById") + @ApiOperation(value = "编辑设备控制指令") + @ApiOperationSupport(order = 5) + public R updateById(@RequestBody ControlEntity req) { + return R.status(service.updateById(req)); + } + + @PutMapping("/updateKnowledge") + @ApiOperation(value = "更新设备控制知识库") + @ApiOperationSupport(order = 6) + public R updateKnowledge() { + invokeService.updateKnowledge("yk"); + return R.success("操作成功！"); + } +} diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/maintenance/mapper/ControlMapper.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/maintenance/mapper/ControlMapper.java new file mode 100644 index 0000000..470d734 --- /dev/null +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/maintenance/mapper/ControlMapper.java @@ -0,0 +1,12 @@ +package com.hnac.hzims.bigmodel.maintenance.mapper; + +import com.hnac.hzims.bigmodel.maintenance.entity.ControlEntity; +import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; + +/** + * @Author: huangxing + * @Date: 2024/08/19 18:42 + */ +public interface ControlMapper extends UserDataScopeBaseMapper { + +} diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/maintenance/service/ControlService.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/maintenance/service/ControlService.java new file mode 100644 index 0000000..264e7ef --- /dev/null +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/maintenance/service/ControlService.java @@ -0,0 +1,21 @@ +package com.hnac.hzims.bigmodel.maintenance.service; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hnac.hzims.bigmodel.maintenance.entity.ControlEntity; +import com.hnac.hzims.bigmodel.maintenance.mapper.ControlMapper; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @Author: huangxing + * @Date: 2024/08/19 18:48 + */ +@Service +@DS("hznlm") +@AllArgsConstructor +@Slf4j +public class ControlService extends ServiceImpl { + +} diff --git a/hzims-service/hzims-big-model/src/main/resources/template/template.yml b/hzims-service/hzims-big-model/src/main/resources/template/template.yml index be2f075..77287f6 100644 --- a/hzims-service/hzims-big-model/src/main/resources/template/template.yml +++ b/hzims-service/hzims-big-model/src/main/resources/template/template.yml @@ -61,6 +61,7 @@ gglm: hotQuestion: "/qa/question_recommand" smartReportGeneratePower: "/custom/smart_report_generate_power" assistantAnalyseAsk: "/qa/assistant_analyse_ask" + updateKnowledge: "/kn/update_knowledge" swagger: base-packages: com.hnac.hzims.bigmodel