Merge branch 'develop' into 公司测试环境4.221

ruoyi-admin/pom.xml

@@ -61,6 +61,12 @@
             <artifactId>ruoyi-generator</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.dahuatech.icc</groupId>
+            <artifactId>java-sdk-oauth</artifactId>
+            <version>1.0.9.2</version>
+        </dependency>
+
     </dependencies>
 
     <build>

ruoyi-admin/src/main/java/com/ruoyi/algorithm/controller/AlgorithmSceneBaseController.java

@@ -84,6 +84,17 @@ public class AlgorithmSceneBaseController extends BaseController
         return toAjax(algorithmSceneBaseService.updateAlgorithmSceneSaveDto(algorithmSceneSaveDto));
     }
 
+    /**
+     * 新增算法场景
+     */
+    @PreAuthorize("@ss.hasPermi('system:algorithmScene:copy')")
+    @Log(title = "算法场景", businessType = BusinessType.INSERT)
+    @PostMapping("/{id}")
+    public AjaxResult copyById(@PathVariable("id") Long id)
+    {
+        return toAjax(algorithmSceneBaseService.copyById(id,getUsername()));
+    }
+
     /**
      * 删除算法场景
      */

ruoyi-admin/src/main/java/com/ruoyi/algorithm/service/IAlgorithmSceneBaseService.java

@@ -71,4 +71,6 @@ public interface IAlgorithmSceneBaseService
     int insertAlgorithmSceneSaveDto(AlgorithmSceneSaveDto algorithmSceneSaveDto);
 
     int updateAlgorithmSceneSaveDto(AlgorithmSceneSaveDto algorithmSceneSaveDto);
+
+    int copyById(Long id, String username);
 }

ruoyi-admin/src/main/java/com/ruoyi/algorithm/service/impl/AlgorithmSceneBaseServiceImpl.java

@@ -9,6 +9,7 @@ import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.ruoyi.algorithm.domain.AlgorithmScenePiece;
+import com.ruoyi.algorithm.domain.dto.AlgorithmPieceDetailsDto;
 import com.ruoyi.algorithm.domain.dto.AlgorithmSceneDetailsDto;
 import com.ruoyi.algorithm.domain.dto.AlgorithmSceneListDto;
 import com.ruoyi.algorithm.domain.dto.AlgorithmSceneSaveDto;
@@ -226,6 +227,46 @@ public class AlgorithmSceneBaseServiceImpl implements IAlgorithmSceneBaseService
         return i;
     }
 
+    @Override
+    public int copyById(Long id, String username) {
+        //更新场景
+        AlgorithmSceneBase oldAlgorithmSceneBase = selectAlgorithmSceneBaseById(id);
+        AlgorithmSceneBase newAlgorithmSceneBase = new AlgorithmSceneBase();
+        BeanUtils.copyBeanProp(newAlgorithmSceneBase, oldAlgorithmSceneBase);
+        newAlgorithmSceneBase.setStatus("1");
+        newAlgorithmSceneBase.setCreateBy(username);
+        newAlgorithmSceneBase.setSceneName(oldAlgorithmSceneBase.getSceneName()+"（副本）");
+        int i = insertAlgorithmSceneBase(newAlgorithmSceneBase);
+
+        //删除场景下算法块及参数数据
+        algorithmScenePieceService.deleteAlgorithmScenePieceBySceneId(newAlgorithmSceneBase.getId());
+
+        //查找旧场景下算法
+        List<AlgorithmPieceDetailsDto> algorithmPieceDetailsDtos = algorithmScenePieceService.selectAlgorithmPieceDetailsDtoBySceneId(id);
+
+
+        //新建场景下算法块及参数
+        List<AlgorithmScenePiece> algorithmScenePieceList = algorithmPieceDetailsDtos
+                .stream()
+                .flatMap(pieceDto -> pieceDto.getVariables()
+                        .stream()
+                        .map(variable -> {
+                            AlgorithmScenePiece algorithmScenePiece = new AlgorithmScenePiece();
+                            algorithmScenePiece.setSceneId(newAlgorithmSceneBase.getId());
+                            algorithmScenePiece.setPieceId(pieceDto.getId());
+                            algorithmScenePiece.setVariableKey(variable.getVariableKey());
+                            algorithmScenePiece.setVariableValue(variable.getVariableValue());
+                            algorithmScenePiece.setSort(pieceDto.getSort());
+                            return algorithmScenePiece;
+                        })).collect(Collectors.toList());
+
+        for (AlgorithmScenePiece algorithmScenePiece : algorithmScenePieceList) {
+            algorithmScenePieceService.insertAlgorithmScenePiece(algorithmScenePiece);
+        }
+
+        return i;
+    }
+
     private void sendAi(Long sceneId, String status) {
         String statusKey;
         //启动

ruoyi-admin/src/main/java/com/ruoyi/icc/IccConfig.java

+package com.ruoyi.icc;
+
+import com.dahuatech.icc.exception.ClientException;
+import com.dahuatech.icc.oauth.http.DefaultClient;
+import com.dahuatech.icc.oauth.http.IClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author 周昊
+ * @desc ...
+ * @date 2023-05-17 15:27:24
+ */
+@Configuration
+public class IccConfig {
+    @Bean
+    public IClient iccDefaultClient() throws ClientException {
+        return new DefaultClient();
+    }
+    /*//如果你项目没有办法增加iccSdk.properties配置文件，你也可以
+    @Bean
+    public IClient iccDefaultClient() throws ClientException {
+        return new DefaultClient("host", "username", "password", "clientId", "clientSecret");
+    }*/
+}

ruoyi-admin/src/main/java/com/ruoyi/icc/test.java

+package com.ruoyi.icc;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.dahuatech.hutool.http.Method;
+import com.dahuatech.icc.exception.ClientException;
+import com.dahuatech.icc.oauth.http.DefaultClient;
+import com.dahuatech.icc.oauth.http.IClient;
+import com.dahuatech.icc.oauth.http.IccHttpHttpRequest;
+import com.dahuatech.icc.oauth.model.v202010.GeneralRequest;
+import com.dahuatech.icc.oauth.model.v202010.GeneralResponse;
+import com.dahuatech.icc.oauth.model.v202010.OauthPublicKeyResponse;
+
+/**
+ * @author 周昊
+ * @desc ...
+ * @date 2023-05-17 15:28:50
+ */
+public class test {
+    public static void main(String[] args) throws ClientException {
+//        IccHttpHttpRequest pubRequest = new IccHttpHttpRequest(PUBLIC_KEY_URL, Method.GET);
+//        String pubBody = pubRequest.execute();
+//        OauthPublicKeyResponse keyResp = (OauthPublicKeyResponse) BeanUtil.toBean(pubBody, OauthPublicKeyResponse.class);
+    }
+}

ruoyi-admin/src/main/resources/icc/iccSdk.properties

+# host
+icc.sdk.host=124.160.33.135:4077
+# ?????
+icc.sdk.clientId=CompanyName
+
+icc.sdk.clientSecret=42bec152-8f04-476a-9aec-e7d616ff3cb3
+# ??????
+icc.sdk.pwdClientId=CompanyName
+icc.sdk.pwdClientSecret=42bec152-8f04-476a-9aec-e7d616ff3cb3
+icc.sdk.username=TEST
+icc.sdk.password=Admin123
+# ??????password
+icc.sdk.grantType=password

ruoyi-admin/src/main/resources/mapper/system/AlgorithmSceneBaseMapper.xml

@@ -117,7 +117,6 @@
     <insert id="insertAlgorithmSceneBase" parameterType="AlgorithmSceneBase" useGeneratedKeys="true" keyProperty="id">
         insert into algorithm_scene_base
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
             <if test="sceneName != null">scene_name,</if>
             <if test="algorithmId != null">algorithm_id,</if>
             <if test="alarmTypes != null">alarm_types,</if>
@@ -134,7 +133,6 @@
             <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
             <if test="sceneName != null">#{sceneName},</if>
             <if test="algorithmId != null">#{algorithmId},</if>
             <if test="alarmTypes != null">#{alarmTypes},</if>