新增全国数据处理接口

slibra-admin/src/main/java/com/slibra/web/controller/business/BigModelController.java

@@ -0,0 +1,109 @@
+package com.slibra.web.controller.business;
+
+import com.alibaba.fastjson2.JSON;
+import com.slibra.business.req.AiChatReq;
+import com.slibra.business.req.AiChatRes;
+import com.slibra.business.service.IFrontService;
+import com.slibra.common.core.controller.BaseController;
+import com.slibra.common.core.domain.AjaxResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 大模型的相关接口
+ */
+@RestController
+@RequestMapping("/bigModel")
+@Slf4j
+public class BigModelController extends BaseController {
+
+
+    @Autowired
+    private IFrontService frontService;
+
+
+    /**
+      * 测试
+      * @return
+      */
+    @GetMapping(value = "/hello")
+    public AjaxResult hello()
+    {
+        log.info("进入了 测试springmvc 接口");
+        return AjaxResult.success("success");
+    }
+
+    /**
+     *AI语音客服大模型请求接口
+     * @param aiChatReq
+     * @return
+     */
+    @PostMapping("/queryBusinessInfo")
+    public AiChatRes queryBusinessInfo(@RequestBody AiChatReq aiChatReq){
+        log.info("进入了 AI语音客服大模型请求 接口，请求参数为{}", JSON.toJSONString(aiChatReq));
+        return this.frontService.queryBusinessInfo(aiChatReq);
+    }
+
+
+//    /**
+//     * 获取大屏的实时数据 + 统计数据
+//     * @return
+//     */
+//    @GetMapping(value = "/realTimeData")
+//    public AjaxResult realTimeData()
+//    {
+//        log.info("进入了 获取大屏的实时数据 + 统计数据 接口");
+//        return AjaxResult.success(frontService.countInfo());
+//    }
+//
+//
+//    /**
+//     * 分页获取大模型的问答记录
+//     * @param tXinyiChatRecord
+//     * @return
+//     */
+//    @GetMapping("/bigModel/qa/pageList")
+//    public TableDataInfo qaPageList(TXinyiChatRecord tXinyiChatRecord)
+//    {
+//        log.info("进入了 分页获取大模型的问答记录 接口");
+//        //获取登录用户信息
+//        Long userId = SecurityUtils.getUserId();
+//        tXinyiChatRecord.setUserId(String.valueOf(userId));
+//        startPage();
+//        return getDataTable(xinyiChatRecordMapper.selectTXinyiChatRecordFirstList(tXinyiChatRecord));
+//    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

slibra-admin/src/main/java/com/slibra/web/controller/business/CityController.java

@@ -0,0 +1,106 @@
+package com.slibra.web.controller.business;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.slibra.common.annotation.Log;
+import com.slibra.common.core.controller.BaseController;
+import com.slibra.common.core.domain.AjaxResult;
+import com.slibra.common.enums.BusinessType;
+import com.slibra.business.domain.City;
+import com.slibra.business.service.ICityService;
+import com.slibra.common.utils.poi.ExcelUtil;
+import com.slibra.common.core.page.TableDataInfo;
+
+/**
+ * 全国省市区数据Controller
+ * 
+ * @author slibra
+ * @date 2024-11-11
+ */
+@RestController
+@RequestMapping("/business/city")
+public class CityController extends BaseController
+{
+    @Autowired
+    private ICityService cityService;
+
+    /**
+     * 查询全国省市区数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('business:city:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(City city)
+    {
+        startPage();
+        List<City> list = cityService.selectCityList(city);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出全国省市区数据列表
+     */
+    @PreAuthorize("@ss.hasPermi('business:city:export')")
+    @Log(title = "全国省市区数据", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, City city)
+    {
+        List<City> list = cityService.selectCityList(city);
+        ExcelUtil<City> util = new ExcelUtil<City>(City.class);
+        util.exportExcel(response, list, "全国省市区数据数据");
+    }
+
+    /**
+     * 获取全国省市区数据详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('business:city:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(cityService.selectCityById(id));
+    }
+
+    /**
+     * 新增全国省市区数据
+     */
+    @PreAuthorize("@ss.hasPermi('business:city:add')")
+    @Log(title = "全国省市区数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody City city)
+    {
+//        city.setCreateBy(getUsername());
+        return toAjax(cityService.insertCity(city));
+    }
+
+    /**
+     * 修改全国省市区数据
+     */
+    @PreAuthorize("@ss.hasPermi('business:city:edit')")
+    @Log(title = "全国省市区数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody City city)
+    {
+//        city.setUpdateBy(getUsername());
+        return toAjax(cityService.updateCity(city));
+    }
+
+    /**
+     * 删除全国省市区数据
+     */
+    @PreAuthorize("@ss.hasPermi('business:city:remove')")
+    @Log(title = "全国省市区数据", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(cityService.deleteCityByIds(ids));
+    }
+}

slibra-admin/src/main/java/com/slibra/web/controller/business/FrontController.java

@@ -1,45 +1,25 @@
 package com.slibra.web.controller.business;
 
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONWriter;
-import com.github.pagehelper.PageInfo;
+import com.slibra.business.domain.City;
+import com.slibra.business.mapper.CityMapper;
 import com.slibra.business.req.AiChatReq;
 import com.slibra.business.req.AiChatRes;
-import com.slibra.business.req.ChatReq;
-import com.slibra.business.req.WorkOrderReq;
 import com.slibra.business.service.IFrontService;
-import com.slibra.common.DecimalUtils;
-import com.slibra.common.constant.HttpStatus;
-import com.slibra.common.constant.MyConstants;
 import com.slibra.common.core.controller.BaseController;
 import com.slibra.common.core.domain.AjaxResult;
 import com.slibra.common.core.domain.R;
-import com.slibra.common.core.page.TableDataInfo;
-import com.slibra.common.enums.BusinessEnum;
-import com.slibra.common.exception.ServiceException;
-import com.slibra.common.utils.DateUtils;
-import com.slibra.common.utils.SecurityUtils;
-import com.slibra.common.utils.StringUtils;
-import com.slibra.common.utils.poi.ExcelUtil;
-import com.slibra.common.utils.uuid.IdUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.slibra.common.constant.MyConstants.*;
+import java.util.List;
 
 /**
  * 前端用户相关接口
  */
 @RestController
-@RequestMapping("/bigModel")
+@RequestMapping("/front")
 @Slf4j
 public class FrontController extends BaseController {
 
@@ -47,27 +27,20 @@ public class FrontController extends BaseController {
     @Autowired
     private IFrontService frontService;
 
+    @Autowired
+    private CityMapper cityMapper;
+
 
-/**
-      * 获取大屏的实时数据 + 统计数据
-      * @return
-      */
-    @GetMapping(value = "/hello")
-    public AjaxResult hello()
-    {
-        log.info("进入了 测试springmvc 接口");
-        return AjaxResult.success("success");
-    }
 
     /**
-     *AI语音客服大模型请求接口
-     * @param aiChatReq
+     * 获取全国省市区接口
+     * @param city
      * @return
      */
-    @PostMapping("/queryBusinessInfo")
-    public AiChatRes queryBusinessInfo(@RequestBody AiChatReq aiChatReq){
-        log.info("进入了 AI语音客服大模型请求 接口，请求参数为{}", JSON.toJSONString(aiChatReq));
-        return this.frontService.queryBusinessInfo(aiChatReq);
+    @GetMapping("/getCities")
+    public R<List<City>> getCities(City city){
+        log.info("进入了 获取全国省市区接口 接口，请求参数为{}", JSON.toJSONString(city));
+        return R.ok(this.cityMapper.selectCityList(city));
     }
 
 

slibra-admin/src/main/resources/application-local.yml

@@ -6,9 +6,11 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/big_model?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                url: jdbc:mysql://localhost:3306/big_model?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.40.21:3306/intelligent_voice_customer_service?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: 1234qwer
+#                password: 1234qwer
+                password: Hongshan2024@longjiang
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

slibra-framework/src/main/java/com/slibra/framework/config/SecurityConfig.java

@@ -123,7 +123,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/register", "/captchaImage","/sendSmsCode/*","/smsLogin","/test/**", "/demo/**").permitAll()
                 .antMatchers("/websocket/**").permitAll()//websocket的
-                .antMatchers("/bigModel/**").permitAll()//2024年11月05日14:18:08 和曹永创交互的接口，不需要token即可访问
+                .antMatchers("/bigModel/**", "/front/**").permitAll()//2024年11月05日14:18:08 和曹永创交互的接口，不需要token即可访问
 //                .antMatchers("/front/**","/grpc/**").permitAll()//临时测试的
                 .antMatchers("/qiniuyun/**", "/out/**", "/business/daily").permitAll()//文件上传相关 外部接口等
                 // 静态资源，可匿名访问

slibra-quartz/src/main/java/com/slibra/quartz/task/GetRealTimeData.java

@@ -13,7 +13,7 @@ public class GetRealTimeData {
 
 
 //    public static final String[] queryTags = {"信义污水厂实际碳源加药量"};
-    public static final String[] queryTags = {"信义污水厂升级出水TN"};
+    public static final String[] queryTags = {"信义污水厂GFJ1_DJDL_Value"};
 
     /**
      * 定时从工业库获取数据
@@ -29,8 +29,8 @@ public class GetRealTimeData {
 
         // 给定时间段的起始时间和结束时间
 
-        LocalDateTime startTime = LocalDateTime.parse("2024-08-20T11:00:00");
-        LocalDateTime endTime = LocalDateTime.parse("2024-08-20T14:20:00");
+        LocalDateTime startTime = LocalDateTime.parse("2024-11-11T09:00:00");
+        LocalDateTime endTime = LocalDateTime.parse("2024-11-11T09:30:00");
 
         // 每个小时的时间格式
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

slibra-system/src/main/java/com/slibra/business/domain/City.java

@@ -0,0 +1,45 @@
+package com.slibra.business.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.slibra.common.annotation.Excel;
+import com.slibra.common.core.domain.BaseEntity;
+
+import java.io.Serializable;
+
+/**
+ * 全国省市区数据对象 city
+ * 
+ * @author slibra
+ * @date 2024-11-11
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class City implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private String id;
+
+    /** 行政区划代码 */
+    @Excel(name = "行政区划代码")
+    private Long code;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 上级id */
+    @Excel(name = "上级id")
+    private Long pid;
+
+    /** 类型 */
+    @Excel(name = "类型")
+    private String type;
+}

slibra-system/src/main/java/com/slibra/business/mapper/CityMapper.java

@@ -0,0 +1,61 @@
+package com.slibra.business.mapper;
+
+import java.util.List;
+import com.slibra.business.domain.City;
+
+/**
+ * 全国省市区数据Mapper接口
+ * 
+ * @author slibra
+ * @date 2024-11-11
+ */
+public interface CityMapper 
+{
+    /**
+     * 查询全国省市区数据
+     * 
+     * @param id 全国省市区数据主键
+     * @return 全国省市区数据
+     */
+    public City selectCityById(String id);
+
+    /**
+     * 查询全国省市区数据列表
+     * 
+     * @param city 全国省市区数据
+     * @return 全国省市区数据集合
+     */
+    public List<City> selectCityList(City city);
+
+    /**
+     * 新增全国省市区数据
+     * 
+     * @param city 全国省市区数据
+     * @return 结果
+     */
+    public int insertCity(City city);
+
+    /**
+     * 修改全国省市区数据
+     * 
+     * @param city 全国省市区数据
+     * @return 结果
+     */
+    public int updateCity(City city);
+
+    /**
+     * 删除全国省市区数据
+     * 
+     * @param id 全国省市区数据主键
+     * @return 结果
+     */
+    public int deleteCityById(String id);
+
+    /**
+     * 批量删除全国省市区数据
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCityByIds(String[] ids);
+}

slibra-system/src/main/java/com/slibra/business/service/ICityService.java

@@ -0,0 +1,61 @@
+package com.slibra.business.service;
+
+import java.util.List;
+import com.slibra.business.domain.City;
+
+/**
+ * 全国省市区数据Service接口
+ * 
+ * @author slibra
+ * @date 2024-11-11
+ */
+public interface ICityService 
+{
+    /**
+     * 查询全国省市区数据
+     * 
+     * @param id 全国省市区数据主键
+     * @return 全国省市区数据
+     */
+    public City selectCityById(String id);
+
+    /**
+     * 查询全国省市区数据列表
+     * 
+     * @param city 全国省市区数据
+     * @return 全国省市区数据集合
+     */
+    public List<City> selectCityList(City city);
+
+    /**
+     * 新增全国省市区数据
+     * 
+     * @param city 全国省市区数据
+     * @return 结果
+     */
+    public int insertCity(City city);
+
+    /**
+     * 修改全国省市区数据
+     * 
+     * @param city 全国省市区数据
+     * @return 结果
+     */
+    public int updateCity(City city);
+
+    /**
+     * 批量删除全国省市区数据
+     * 
+     * @param ids 需要删除的全国省市区数据主键集合
+     * @return 结果
+     */
+    public int deleteCityByIds(String[] ids);
+
+    /**
+     * 删除全国省市区数据信息
+     * 
+     * @param id 全国省市区数据主键
+     * @return 结果
+     */
+    public int deleteCityById(String id);
+}

slibra-system/src/main/java/com/slibra/business/service/impl/CityServiceImpl.java

@@ -0,0 +1,93 @@
+package com.slibra.business.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.slibra.business.mapper.CityMapper;
+import com.slibra.business.domain.City;
+import com.slibra.business.service.ICityService;
+
+/**
+ * 全国省市区数据Service业务层处理
+ * 
+ * @author slibra
+ * @date 2024-11-11
+ */
+@Service
+public class CityServiceImpl implements ICityService 
+{
+    @Autowired
+    private CityMapper cityMapper;
+
+    /**
+     * 查询全国省市区数据
+     * 
+     * @param id 全国省市区数据主键
+     * @return 全国省市区数据
+     */
+    @Override
+    public City selectCityById(String id)
+    {
+        return cityMapper.selectCityById(id);
+    }
+
+    /**
+     * 查询全国省市区数据列表
+     * 
+     * @param city 全国省市区数据
+     * @return 全国省市区数据
+     */
+    @Override
+    public List<City> selectCityList(City city)
+    {
+        return cityMapper.selectCityList(city);
+    }
+
+    /**
+     * 新增全国省市区数据
+     * 
+     * @param city 全国省市区数据
+     * @return 结果
+     */
+    @Override
+    public int insertCity(City city)
+    {
+        return cityMapper.insertCity(city);
+    }
+
+    /**
+     * 修改全国省市区数据
+     * 
+     * @param city 全国省市区数据
+     * @return 结果
+     */
+    @Override
+    public int updateCity(City city)
+    {
+        return cityMapper.updateCity(city);
+    }
+
+    /**
+     * 批量删除全国省市区数据
+     * 
+     * @param ids 需要删除的全国省市区数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCityByIds(String[] ids)
+    {
+        return cityMapper.deleteCityByIds(ids);
+    }
+
+    /**
+     * 删除全国省市区数据信息
+     * 
+     * @param id 全国省市区数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCityById(String id)
+    {
+        return cityMapper.deleteCityById(id);
+    }
+}

slibra-system/src/main/resources/mapper/business/CityMapper.xml

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.slibra.business.mapper.CityMapper">
+    
+    <resultMap type="City" id="CityResult">
+        <result property="id"    column="id"    />
+        <result property="code"    column="code"    />
+        <result property="name"    column="name"    />
+        <result property="pid"    column="pid"    />
+        <result property="type"    column="type"    />
+    </resultMap>
+
+    <sql id="selectCityVo">
+        select id, code, name, pid, type from city
+    </sql>
+
+    <select id="selectCityList" parameterType="City" resultMap="CityResult">
+        <include refid="selectCityVo"/>
+        <where>
+            1 = 1
+            <if test="code != null "> and code = #{code}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="pid != null "> and pid = #{pid}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
+        </where>
+        order by id asc
+    </select>
+    
+    <select id="selectCityById" parameterType="String" resultMap="CityResult">
+        <include refid="selectCityVo"/>
+        where id = #{id}
+    </select>
+
+    <!-- <insert id="insertCity" parameterType="City" useGeneratedKeys="true" keyProperty="id">
+        insert into city
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="code != null">code,</if>
+            <if test="name != null">name,</if>
+            <if test="pid != null">pid,</if>
+            <if test="type != null">type,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="code != null">#{code},</if>
+            <if test="name != null">#{name},</if>
+            <if test="pid != null">#{pid},</if>
+            <if test="type != null">#{type},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCity" parameterType="City">
+        update city
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="code != null">code = #{code},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="pid != null">pid = #{pid},</if>
+            <if test="type != null">type = #{type},</if>
+        </trim>
+        ,revision = revision + 1
+        where id = #{id}
+    </update>
+
+    
+
+   <delete id="deleteCityById" parameterType="String">
+        update city set del_flag = 2,revision = revision + 1 where del_flag = 0 and id = #{id}
+    </delete>
+
+    <delete id="deleteCityByIds" parameterType="String">
+        update city set del_flag = 2,revision = revision + 1 where del_flag = 0 and id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>-->
+</mapper>