1、增加单位图标管理

2、修改机构登录 3、订单问题处理 4、完善组态绑定及删除关联
2025-06-22 10:33:36 +08:00
parent 3bac43403b
commit b2cee8aeb7
40 changed files with 1367 additions and 86 deletions
--- a/xinda-admin/src/main/java/com/xinda/web/controller/system/SysInfoController.java
+++ b/xinda-admin/src/main/java/com/xinda/web/controller/system/SysInfoController.java
@@ -0,0 +1,110 @@
+package com.xinda.system.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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.xinda.common.annotation.Log;
+import com.xinda.common.core.controller.BaseController;
+import com.xinda.common.core.domain.AjaxResult;
+import com.xinda.common.enums.BusinessType;
+import com.xinda.system.domain.SysInfo;
+import com.xinda.system.service.ISysInfoService;
+import com.xinda.common.utils.poi.ExcelUtil;
+import com.xinda.common.core.page.TableDataInfo;
+
+/**
+ * 系统配置Controller
+ *
+ * @author kerwincui
+ * @date 2025-05-29
+ */
+@RestController
+@RequestMapping("/system/sysInfo")
+@Api(tags = "系统配置")
+public class SysInfoController extends BaseController
+{
+    @Autowired
+    private ISysInfoService sysInfoService;
+
+/**
+ * 查询系统配置列表
+ */
+@PreAuthorize("@ss.hasPermi('system:sysInfo:list')")
+@GetMapping("/list")
+@ApiOperation("查询系统配置列表")
+    public TableDataInfo list(SysInfo sysInfo)
+    {
+        startPage();
+        List<SysInfo> list = sysInfoService.selectSysInfoList(sysInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出系统配置列表
+     */
+    @ApiOperation("导出系统配置列表")
+    @PreAuthorize("@ss.hasPermi('system:sysInfo:export')")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SysInfo sysInfo)
+    {
+        List<SysInfo> list = sysInfoService.selectSysInfoList(sysInfo);
+        ExcelUtil<SysInfo> util = new ExcelUtil<SysInfo>(SysInfo.class);
+        util.exportExcel(response, list, "系统配置数据");
+    }
+
+    /**
+     * 获取系统配置详细信息
+     */
+    @GetMapping(value = "/getSysInfo")
+    @ApiOperation("获取系统配置详细信息")
+    public AjaxResult getSysInfo()
+    {
+        Long id = 1L;
+        return success(sysInfoService.selectSysInfoById(id));
+    }
+
+//    /**
+//     * 新增系统配置
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:sysInfo:add')")
+//    @PostMapping
+//    @ApiOperation("新增系统配置")
+//    public AjaxResult add(@RequestBody SysInfo sysInfo)
+//    {
+//        return toAjax(sysInfoService.insertSysInfo(sysInfo));
+//    }
+
+    /**
+     * 修改系统配置
+     */
+    @PreAuthorize("@ss.hasPermi('system:sysInfo:edit')")
+    @PutMapping
+    @ApiOperation("修改系统配置")
+    public AjaxResult edit(@RequestBody SysInfo sysInfo)
+    {
+        return toAjax(sysInfoService.updateSysInfo(sysInfo));
+    }
+
+//    /**
+//     * 删除系统配置
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:sysInfo:remove')")
+//    @DeleteMapping("/{ids}")
+//    @ApiOperation("删除系统配置")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(sysInfoService.deleteSysInfoByIds(ids));
+//    }
+}
--- a/xinda-admin/src/main/java/com/xinda/web/controller/system/SysLoginController.java
+++ b/xinda-admin/src/main/java/com/xinda/web/controller/system/SysLoginController.java
@@ -57,35 +57,35 @@ public class SysLoginController
     * @param loginBody 登录信息
     * @return 结果
     */
-//    @ApiOperation("机构用户登录")
-//    @PostMapping("/deptLogin")
-//    public AjaxResult deptLogin(HttpServletRequest request, @RequestBody LoginBody loginBody)
-//    {
-//        AjaxResult ajax = AjaxResult.success();
-//        // 生成令牌
-//        String token = loginService.deptLogin(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
-//                loginBody.getUuid(), loginBody.getSourceType(), request.getHeader(LANGUAGE));
-//        ajax.put(Constants.TOKEN, token);
-//        return ajax;
-//    }
-
-    /**
-     * 登录方法
-     *
-     * @param loginBody 登录信息
-     * @return 结果
-     */
-    @ApiOperation("用户登录")
+    @ApiOperation("机构用户登录")
    @PostMapping("/login")
    public AjaxResult login(HttpServletRequest request, @RequestBody LoginBody loginBody)
    {
        AjaxResult ajax = AjaxResult.success();
        // 生成令牌
-        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+        String token = loginService.login(loginBody.getDeptId(),loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
                loginBody.getUuid(), loginBody.getSourceType(), request.getHeader(LANGUAGE));
        ajax.put(Constants.TOKEN, token);
        return ajax;
    }
+//
+//    /**
+//     * 登录方法
+//     *
+//     * @param loginBody 登录信息
+//     * @return 结果
+//     */
+//    @ApiOperation("用户登录")
+//    @PostMapping("/login")
+//    public AjaxResult login(HttpServletRequest request, @RequestBody LoginBody loginBody)
+//    {
+//        AjaxResult ajax = AjaxResult.success();
+//        // 生成令牌
+//        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+//                loginBody.getUuid(), loginBody.getSourceType(), request.getHeader(LANGUAGE));
+//        ajax.put(Constants.TOKEN, token);
+//        return ajax;
+//    }

    /**
     * 获取用户信息
--- a/xinda-admin/src/main/java/com/xinda/web/controller/system/SysSmsController.java
+++ b/xinda-admin/src/main/java/com/xinda/web/controller/system/SysSmsController.java
@@ -41,7 +41,7 @@ public class SysSmsController extends BaseController
 /**
 * 查询系统消息列表
 */
-@PreAuthorize("@ss.hasPermi('system:sms:list')")
+//@PreAuthorize("@ss.hasPermi('system:sms:list')")
@GetMapping("/list")
@ApiOperation("查询系统消息列表")
    public TableDataInfo list(SysSms sysSms)
@@ -55,7 +55,7 @@ public class SysSmsController extends BaseController
     * 导出系统消息列表
     */
    @ApiOperation("导出系统消息列表")
-    @PreAuthorize("@ss.hasPermi('system:sms:export')")
+//    @PreAuthorize("@ss.hasPermi('system:sms:export')")
    @PostMapping("/export")
    public void export(HttpServletResponse response, SysSms sysSms)
    {
@@ -67,7 +67,7 @@ public class SysSmsController extends BaseController
    /**
     * 获取系统消息详细信息
     */
-    @PreAuthorize("@ss.hasPermi('system:sms:query')")
+//    @PreAuthorize("@ss.hasPermi('system:sms:query')")
    @GetMapping(value = "/{smsId}")
    @ApiOperation("获取系统消息详细信息")
    public AjaxResult getInfo(@PathVariable("smsId") Long smsId)