旧指房宝相机入库

src/main/java/com/fdkankan/task/controller/TbCameraInstanceController.java

@@ -0,0 +1,96 @@
+package com.fdkankan.task.controller;
+
+import com.mybatisflex.core.paginate.Page;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.fdkankan.task.entity.TbCameraInstance;
+import com.fdkankan.task.service.TbCameraInstanceService;
+import org.springframework.web.bind.annotation.RestController;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ *  控制层。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+@RestController
+@RequestMapping("/tbCameraInstance")
+public class TbCameraInstanceController {
+
+    @Autowired
+    private TbCameraInstanceService tbCameraInstanceService;
+
+    /**
+     * 添加。
+     *
+     * @param tbCameraInstance 
+     * @return {@code true} 添加成功，{@code false} 添加失败
+     */
+    @PostMapping("save")
+    public boolean save(@RequestBody TbCameraInstance tbCameraInstance) {
+        return tbCameraInstanceService.save(tbCameraInstance);
+    }
+
+    /**
+     * 根据主键删除。
+     *
+     * @param id 主键
+     * @return {@code true} 删除成功，{@code false} 删除失败
+     */
+    @DeleteMapping("remove/{id}")
+    public boolean remove(@PathVariable Serializable id) {
+        return tbCameraInstanceService.removeById(id);
+    }
+
+    /**
+     * 根据主键更新。
+     *
+     * @param tbCameraInstance 
+     * @return {@code true} 更新成功，{@code false} 更新失败
+     */
+    @PutMapping("update")
+    public boolean update(@RequestBody TbCameraInstance tbCameraInstance) {
+        return tbCameraInstanceService.updateById(tbCameraInstance);
+    }
+
+    /**
+     * 查询所有。
+     *
+     * @return 所有数据
+     */
+    @GetMapping("list")
+    public List<TbCameraInstance> list() {
+        return tbCameraInstanceService.list();
+    }
+
+    /**
+     * 根据主键获取详细信息。
+     *
+     * @param id 主键
+     * @return 详情
+     */
+    @GetMapping("getInfo/{id}")
+    public TbCameraInstance getInfo(@PathVariable Serializable id) {
+        return tbCameraInstanceService.getById(id);
+    }
+
+    /**
+     * 分页查询。
+     *
+     * @param page 分页对象
+     * @return 分页对象
+     */
+    @GetMapping("page")
+    public Page<TbCameraInstance> page(Page<TbCameraInstance> page) {
+        return tbCameraInstanceService.page(page);
+    }
+
+}

src/main/java/com/fdkankan/task/entity/TbCameraInstance.java

@@ -0,0 +1,84 @@
+package com.fdkankan.task.entity;
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  实体类。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(value = "tb_camera_instance")
+public class TbCameraInstance implements Serializable {
+
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    /**
+     * 相机的Mac地址
+     */
+    private String childName;
+
+    /**
+     * 激活时间
+     */
+    private Date activeTime;
+
+    /**
+     * 对应cameraType的Id
+     */
+    private Integer cameraTypeId;
+
+    /**
+     * 相机密码
+     */
+    private String childPassword;
+
+    /**
+     * wifi名称
+     */
+    private String wifiName;
+
+    /**
+     * wifi密码
+     */
+    private String wifiPassword;
+
+    /**
+     * 余额
+     */
+    private String balance;
+
+    /**
+     * 用户账号(企业用户)
+     */
+    private String userName;
+
+    /**
+     * 0表示客户，1表示员工，2表示送的，3表示其他
+     */
+    private Integer own;
+
+    /**
+     * 0表示本国，1表示国外
+     */
+    private Integer country;
+
+    /**
+     * 经销商
+     */
+    private String agency;
+
+}

src/main/java/com/fdkankan/task/generate/AutoGenerate.java

@@ -24,14 +24,17 @@ public class AutoGenerate {
 //        dataSource.setJdbcUrl("jdbc:mysql://120.24.144.164:3306/4dkankan_v4_sale?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true");
 //        dataSource.setUsername("root");
 //        dataSource.setPassword("4Dage@4Dage#@168");
-        dataSource.setJdbcUrl("jdbc:mysql://120.24.202.7:3306/zhi_house?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true");
+//        dataSource.setJdbcUrl("jdbc:mysql://120.24.202.7:3306/zhi_house?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true");
+//        dataSource.setUsername("root");
+//        dataSource.setPassword("zfb@20210727%");
+        dataSource.setJdbcUrl("jdbc:mysql://47.112.166.173:3306/zhi_house?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true");
         dataSource.setUsername("root");
-        dataSource.setPassword("zfb@20210727%");
+        dataSource.setPassword("4dkankan4dage");
 
         //创建配置内容，两种风格都可以。
 
         GlobalConfig globalConfig = createGlobalConfigUseStyle1("com.fdkankan.task",new String[]{
-                "tb_scene_pro",
+                "tb_camera_instance",
         });
         //GlobalConfig globalConfig = createGlobalConfigUseStyle2();
 

src/main/java/com/fdkankan/task/jobhandler/zfb/ZfbXxlJob.java

@@ -1,11 +1,16 @@
 package com.fdkankan.task.jobhandler.zfb;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.dingtalk.DingTalkSendUtils;
 import com.fdkankan.task.entity.Repair;
+import com.fdkankan.task.entity.TbCameraInstance;
 import com.fdkankan.task.entity.TbSceneNum;
 import com.fdkankan.task.jobhandler.sale.SaleXxlJobUtil;
 import com.fdkankan.task.jobhandler.util.Utils;
 import com.fdkankan.task.mapper.RepairMapper;
+import com.fdkankan.task.mapper.TbCameraInstanceMapper;
 import com.fdkankan.task.mapper.TbSceneNumMapper;
 import com.mybatisflex.annotation.UseDataSource;
 import com.mybatisflex.core.datasource.DataSourceKey;
@@ -18,6 +23,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
@@ -104,5 +110,50 @@ public class ZfbXxlJob {
 
     }
 
+    @Autowired
+    TbCameraInstanceMapper tbCameraInstanceMapper;
 
+    @XxlJob("oldZfbCameraAdd")
+    @UseDataSource("old-zfb")
+    public void oldZfbCameraAdd(){
+        String taskId = UUID.randomUUID().toString().replace("-", "");
+        logger.info("oldZfbCameraAdd---------------start,taskId:{}",taskId);
+        try {
+            String param = XxlJobHelper.getJobParam();    // 获取参数
+            if(StringUtils.isNotBlank(param)){
+                JSONArray jsonArray = JSON.parseArray(param);
+                for (Object object : jsonArray) {
+                    JSONObject jsonObject = (JSONObject) object;
+                    String childName = jsonObject.getString("childName");
+                    String userName = jsonObject.getString("userName");
+                    QueryWrapper queryWrapper = QueryWrapper.create()
+                            .where("child_name ='"+childName+"'");
+                    List<TbCameraInstance> tbCameraInstances = tbCameraInstanceMapper.selectListByQuery(queryWrapper);
+                    if(!tbCameraInstances.isEmpty()){
+                        logger.info("oldZfbCameraAdd-已存在-error:{}",childName);
+                    }
+                    TbCameraInstance tbCameraInstance = new TbCameraInstance();
+                    tbCameraInstance.setChildName(childName);
+                    tbCameraInstance.setActiveTime(new Date());
+                    tbCameraInstance.setCameraTypeId(1);
+                    tbCameraInstance.setChildPassword("4dkankan@4dage");
+                    tbCameraInstance.setWifiName(childName);
+                    tbCameraInstance.setWifiPassword("12345678");
+                    tbCameraInstance.setBalance("99999999");
+                    tbCameraInstance.setUserName(userName);
+                    tbCameraInstance.setOwn(0);
+                    tbCameraInstance.setCountry(0);
+                    tbCameraInstance.setAgency("4dage");
+                    tbCameraInstanceMapper.insert(tbCameraInstance);
+
+                }
+            }
+
+        }catch (Exception e){
+            logger.info("oldZfbCameraAdd-error,taskId:{},{}",taskId,e);
+        }finally {
+            logger.info("oldZfbCameraAdd---------------end,taskId::{}",taskId);
+        }
+
+    }
 }

src/main/java/com/fdkankan/task/mapper/TbCameraInstanceMapper.java

@@ -0,0 +1,14 @@
+package com.fdkankan.task.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.fdkankan.task.entity.TbCameraInstance;
+
+/**
+ *  映射层。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+public interface TbCameraInstanceMapper extends BaseMapper<TbCameraInstance> {
+
+}

src/main/java/com/fdkankan/task/service/TbCameraInstanceService.java

@@ -0,0 +1,14 @@
+package com.fdkankan.task.service;
+
+import com.mybatisflex.core.service.IService;
+import com.fdkankan.task.entity.TbCameraInstance;
+
+/**
+ *  服务层。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+public interface TbCameraInstanceService extends IService<TbCameraInstance> {
+
+}

src/main/java/com/fdkankan/task/service/impl/TbCameraInstanceServiceImpl.java

@@ -0,0 +1,18 @@
+package com.fdkankan.task.service.impl;
+
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.fdkankan.task.entity.TbCameraInstance;
+import com.fdkankan.task.mapper.TbCameraInstanceMapper;
+import com.fdkankan.task.service.TbCameraInstanceService;
+import org.springframework.stereotype.Service;
+
+/**
+ *  服务层实现。
+ *
+ * @author Admin
+ * @since 2023-12-01
+ */
+@Service
+public class TbCameraInstanceServiceImpl extends ServiceImpl<TbCameraInstanceMapper, TbCameraInstance> implements TbCameraInstanceService {
+
+}